cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: refs/heads/master - Summary: fix cloud-agent KVM calls to cloudstack-agent for centos6.3
Date Wed, 13 Feb 2013 06:16:29 GMT
Updated Branches:
  refs/heads/master 15e466c56 -> ae2b673e0


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

BUG-ID: CLOUDSTACK-1234
Bugfix-for: 4.1, master
Reported-by: Rayees Namathponnan
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360736064 -0700


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ae2b673e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ae2b673e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ae2b673e

Branch: refs/heads/master
Commit: ae2b673e031e5cacdcece275985cdc4c9ee491ac
Parents: 15e466c
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Tue Feb 12 23:14:24 2013 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Tue Feb 12 23:16:22 2013 -0700

----------------------------------------------------------------------
 scripts/vm/hypervisor/kvm/setup_agent.sh           |   12 ++++++------
 .../kvm/discoverer/KvmServerDiscoverer.java        |    2 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ae2b673e/scripts/vm/hypervisor/kvm/setup_agent.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/kvm/setup_agent.sh b/scripts/vm/hypervisor/kvm/setup_agent.sh
index c975393..243f4a2 100755
--- 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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ae2b673e/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
index 7662620..75e00ad 100644
--- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
@@ -212,7 +212,7 @@ Listener, ResourceStateAdapter {
             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>();

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ae2b673e/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 82013d4..79ccdb3 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -2361,7 +2361,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
 					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 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
 
                 try {
 					SSHCmdHelper.sshExecuteCmdOneShot(connection,
-							"service cloud-agent restart");
+							"service cloudstack-agent restart");
                 } catch (sshException e) {
                     return false;
                 }


Mime
View raw message