Fix rename and enable service post install

Author: nvazquez

packaging/centos7/cloud.spec

@@ -427,6 +427,7 @@ cp -a ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib/libvirtqemuhook %{_sysconfd
 mkdir -m 0755 -p /usr/share/cloudstack-agent/tmp
 /sbin/service libvirtd restart
 /sbin/systemctl enable cloudstack-agent > /dev/null 2>&1 || true
+/sbin/systemctl enable cloudstack-rolling-maintenance@p > /dev/null 2>&1 || true
 
 # if saved configs from upgrade exist, copy them over
 if [ -f "%{_sysconfdir}/cloud.rpmsave/agent/agent.properties" ]; then

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceServiceExecutor.java

@@ -27,7 +27,7 @@
 
 public class RollingMaintenanceServiceExecutor extends RollingMaintenanceExecutorBase implements RollingMaintenanceExecutor {
 
-    private static final String servicePrefix = "cloudstack-rolling-service";
+    private static final String servicePrefix = "cloudstack-rolling-maintenance";
     private static final Logger s_logger = Logger.getLogger(RollingMaintenanceServiceExecutor.class);
 
     public RollingMaintenanceServiceExecutor(String hooksDir) {