Summary: fix cloud-agent KVM calls to cloudstack-agent for centos6.3

Marcus Sorensen · Marcus Sorensen · commit ae2b673e031e · 2013-02-12T23:16:22.000-07:00
BUG-ID: CLOUDSTACK-1234
Bugfix-for: 4.1, master
Reported-by: Rayees Namathponnan
Signed-off-by: Marcus Sorensen &lt;marcus@betterservers.com&gt; 1360736064 -0700
diff --git a/scripts/vm/hypervisor/kvm/setup_agent.sh b/scripts/vm/hypervisor/kvm/setup_agent.sh
@@ -19,12 +19,12 @@
 
  
 
-# Did cloud-agent installed
+# Did cloudstack-agent installed
 #set -x
 install_cloud_agent() {
     local dev=$1
     local retry=10
-    which cloud-setup-agent
+    which cloudstack-setup-agent
     if [ $? -gt 0 ]
     then 
         # download  the repo
@@ -51,7 +51,7 @@ install_cloud_agent() {
         while [ "$retry" -gt "0" ]
         do
             yum clean all
-            yum install cloud-agent -y
+            yum install cloudstack-agent -y
             if [ $? -gt 0 ]
             then
                 let retry=retry-1
@@ -64,7 +64,7 @@ install_cloud_agent() {
         while [ "$retry" -gt "0" ]
         do
 	        yum clean all
-	        yum update cloud-agent -y
+	        yum update cloudstack-agent -y
             if [ $? -gt 0 ]
             then
                 let retry=retry-1
@@ -155,7 +155,7 @@ cloud_agent_setup() {
         sed -i  's/\(SELINUX\)\(.*\)/\1=permissive/' /etc/selinux/config
         setenforce 0
     fi
-    cloud-setup-agent --host=$host --zone=$zone --pod=$pod --cluster=$cluster --guid=$guid -a > /dev/null
+    cloudstack-setup-agent --host=$host --zone=$zone --pod=$pod --cluster=$cluster --guid=$guid -a > /dev/null
 }
 
 cloud_consoleP_setup() {
@@ -224,5 +224,5 @@ then
     setenforce 0
 fi
 
-cloud-setup-agent --host=$host --zone=$zone --pod=$pod --cluster=$cluster --guid=$guid $paramters -a > /dev/null
+cloudstack-setup-agent --host=$host --zone=$zone --pod=$pod --cluster=$cluster --guid=$guid $paramters -a > /dev/null
 #cloud_consoleP_setup $host $zone $pod
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
@@ -212,7 +212,7 @@ public Map<? extends ServerResource, Map<String, String>> find(long dcId,
             parameters += " --prvNic=" + kvmPrivateNic;
             parameters += " --guestNic=" + kvmGuestNic;
 
-            SSHCmdHelper.sshExecuteCmd(sshConnection, "cloud-setup-agent " + parameters, 3);
+            SSHCmdHelper.sshExecuteCmd(sshConnection, "cloudstack-setup-agent " + parameters, 3);
 
             KvmDummyResourceBase kvmResource = new KvmDummyResourceBase();
             Map<String, Object> params = new HashMap<String, Object>();
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -2361,7 +2361,7 @@ private boolean doCancelMaintenance(long hostId) {
 					ResourceState.Event.AdminCancelMaintenance, _nodeId);
             _agentMgr.pullAgentOutMaintenance(hostId);
 
-			// for kvm, need to log into kvm host, restart cloud-agent
+			// for kvm, need to log into kvm host, restart cloudstack-agent
             if (host.getHypervisorType() == HypervisorType.KVM) {
                 _hostDao.loadDetails(host);
                 String password = host.getDetail("password");
@@ -2382,7 +2382,7 @@ private boolean doCancelMaintenance(long hostId) {
 
                 try {
 					SSHCmdHelper.sshExecuteCmdOneShot(connection,
-							"service cloud-agent restart");
+							"service cloudstack-agent restart");
                 } catch (sshException e) {
                     return false;
                 }
