CLOUDSTACK-6931: Set hypervisor.type in agent.properties using cloudstack-setup -t option. Default is kvm.

Kishan Kavala · yadvr · commit ccee282a743c · 2014-07-31T18:50:43.000+02:00
(cherry picked from commit 89854de) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/agent/bindir/cloud-setup-agent.in b/agent/bindir/cloud-setup-agent.in
@@ -61,6 +61,14 @@ def getUserInputs():
     if clusterId == "":
         clusterId = oldCluster
 
+    oldHypervisor = cfo.getEntry("hypervisor")
+    if oldHypervisor == "":
+        oldHypervisor = "kvm"
+
+    hypervisor = raw_input("Please input the Hypervisor type kvm/lxc:[%s]"%oldCluster)
+    if hypervisor == "":
+        hypervisor = oldHypervisor
+
     try:
         defaultNic = networkConfig.getDefaultNetwork()
     except:
@@ -76,7 +84,7 @@ def getUserInputs():
         elif network == "":
             network = defNic
 
-    return [mgtSvr, zoneToken, network, podId, clusterId]
+    return [mgtSvr, zoneToken, network, podId, clusterId, hypervisor]
 
 if __name__ == '__main__':
     initLoging("@AGENTLOGDIR@/setup.log")
@@ -90,6 +98,7 @@ if __name__ == '__main__':
     parser.add_option("-z", "--zone", dest="zone", help="zone id")
     parser.add_option("-p", "--pod", dest="pod", help="pod id")
     parser.add_option("-c", "--cluster", dest="cluster", help="cluster id")
+    parser.add_option("-t", "--hypervisor", default="kvm", dest="hypervisor", help="hypervisor type")
     parser.add_option("-g", "--guid", dest="guid", help="guid")
     parser.add_option("--pubNic", dest="pubNic", help="Public traffic interface")
     parser.add_option("--prvNic", dest="prvNic", help="Private traffic interface")
@@ -108,6 +117,7 @@ if __name__ == '__main__':
         glbEnv.defaultNic = userInputs[2]
         glbEnv.pod = userInputs[3]
         glbEnv.cluster = userInputs[4]
+        glbEnv.hypervisor = userInputs[5]
         #generate UUID
         glbEnv.uuid = old_config.getEntry("guid")
         if glbEnv.uuid == "":
@@ -124,6 +134,7 @@ if __name__ == '__main__':
         glbEnv.zone = options.zone
         glbEnv.pod = options.pod
         glbEnv.cluster = options.cluster
+        glbEnv.hypervisor = options.hypervisor
         glbEnv.nics.append(options.prvNic)
         glbEnv.nics.append(options.pubNic)
         glbEnv.nics.append(options.guestNic)
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
@@ -93,7 +93,7 @@ domr.scripts.dir=scripts/network/domr/kvm
 #libvirt.vif.driver=com.cloud.hypervisor.kvm.resource.BridgeVifDriver
 
 # set the hypervisor type, values are: kvm, lxc
-# hypervisor.type=kvm
+hypervisor.type=kvm
 
 # set the hypervisor URI. Usually there is no need for changing this
 # For KVM: qemu:///system
diff --git a/python/lib/cloudutils/globalEnv.py b/python/lib/cloudutils/globalEnv.py
@@ -32,6 +32,8 @@ def __init__(self):
         self.pod = None
         #cluster id or cluster name
         self.cluster = None
+        #hypervisor type. KVM/LXC. Default is KVM
+        self.hypervisor = "kvm"
         #nics: 0: private nic, 1: guest nic, 2: public nic used by agent
         self.nics = []
         #uuid
diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py
@@ -671,6 +671,7 @@ def configAgent(self):
             cfo.addEntry("zone", self.syscfg.env.zone)
             cfo.addEntry("pod", self.syscfg.env.pod)
             cfo.addEntry("cluster", self.syscfg.env.cluster)
+            cfo.addEntry("hypervisor.type", self.syscfg.env.hypervisor)
             cfo.addEntry("port", "8250")
             cfo.addEntry("private.network.device", self.syscfg.env.nics[0])
             cfo.addEntry("public.network.device", self.syscfg.env.nics[1])
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
@@ -203,6 +203,7 @@ public boolean processTimeout(long agentId, long seq) {
             parameters += " --pubNic=" + kvmPublicNic;
             parameters += " --prvNic=" + kvmPrivateNic;
             parameters += " --guestNic=" + kvmGuestNic;
+            parameters += " --hypervisor=" + cluster.getHypervisorType().toString().toLowerCase();
 
             SSHCmdHelper.sshExecuteCmd(sshConnection, "cloudstack-setup-agent " + parameters, 3);
 
