diff options
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/overcloud/config.py | 3 | ||||
| -rw-r--r-- | apex/overcloud/deploy.py | 9 | ||||
| -rw-r--r-- | apex/undercloud/undercloud.py | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/apex/overcloud/config.py b/apex/overcloud/config.py index a7f7d848..b0cbb18b 100644 --- a/apex/overcloud/config.py +++ b/apex/overcloud/config.py @@ -66,9 +66,6 @@ def create_nic_template(network_settings, deploy_settings, role, template_dir, nets['tenant']['nic_mapping'][role]['interface-options'] =\ ds['performance'][role.title()]['vpp']['interface-options'] - if role == 'controller' and ds.get('sfc', None): - ext_net = 'interface' - template_output = template.render( nets=nets, role=role, 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: diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index 5d73dd49..013570d3 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -150,7 +150,8 @@ class Undercloud: if os.path.exists(dest_img): os.remove(dest_img) shutil.copyfile(src_img, dest_img) - + shutil.chown(dest_img, user='qemu', group='qemu') + os.chmod(dest_img, 0o0744) # TODO(trozet):check if resize needed right now size is 50gb # there is a lib called vminspect which has some dependencies and is # not yet available in pip. Consider switching to this lib later. @@ -192,6 +193,7 @@ class Undercloud: "enable_ui false", "undercloud_update_packages false", "undercloud_debug false", + "inspection_extras false", "undercloud_hostname undercloud.{}".format(ns['dns-domain']), "local_ip {}/{}".format(str(ns_admin['installer_vm']['ip']), str(ns_admin['cidr']).split('/')[1]), |