From 8af37f28bcd5bf990ef501601ec6998b8f9b8fcc Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Tue, 28 Nov 2017 16:26:22 -0500 Subject: Fix nested kvm detection and enablement - Fix ansible kvm_intel kernel module reload when trying to enable nested kvm - Add "--libvirt-type qemu" to deploy command when nested kvm is not enabled. JIRA: APEX-514 Change-Id: I0e659b1c99b5732854d723e1cb049845cb60ef37 Signed-off-by: Feng Pan --- apex/overcloud/deploy.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'apex') diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 3ddb5f40..809afc13 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -129,7 +129,7 @@ def create_deploy_cmd(ds, ns, inv, tmp_dir, elif num_control > 1 and not ds['global_params']['ha_enabled']: num_control = 1 cmd = "openstack overcloud deploy --templates --timeout {} " \ - "--libvirt-type kvm".format(con.DEPLOY_TIMEOUT) + .format(con.DEPLOY_TIMEOUT) # build cmd env args for option in deploy_options: cmd += " -e {}".format(option) @@ -139,6 +139,13 @@ def create_deploy_cmd(ds, ns, inv, tmp_dir, cmd += ' --control-flavor control --compute-flavor compute' if net_data: cmd += ' --networks-file network_data.yaml' + libvirt_type = 'kvm' + if virtual: + with open('/sys/module/kvm_intel/parameters/nested') as f: + nested_kvm = f.read().strip() + if nested_kvm != 'Y': + libvirt_type = 'qemu' + cmd += ' --libvirt-type {}'.format(libvirt_type) logging.info("Deploy command set: {}".format(cmd)) with open(os.path.join(tmp_dir, 'deploy_command'), 'w') as fh: -- cgit 1.2.3-korg