openstack
/
python-tripleoclient
Code Issues Proposed changes

Move enable_nova after enable_ironic 

The ironic environment also deploys an ironic configured nova-compute,
however this should not be deployed if enable_nova=false.

This change moves enable_nova after enable_ironic so that nova-compute
is not deployed when enable_nova=false.

Change-Id: Icbc549fac9d83caffb282632e442736cac17ad1e
Blueprint: nova-less-deploy
This commit is contained in:
Steve Baker 2019-08-18 22:58:18 +00:00
parent 5a66fe5446
commit 8a5d354232
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tripleoclient/v1/undercloud_config.py
View File

@ -506,12 +506,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
'-e', os.path.join(tht_templates, 'environments/use-dns-for-vips.yaml')
]
if not CONF.get('enable_nova', True):
deploy_args += [
'-e', os.path.join(
tht_templates, 'environments/undercloud-disable-nova.yaml')
]
# we want to load this environment after undercloud.yaml for precedence.
if CONF.get('container_cli', 'podman') == 'podman':
deploy_args += [
@ -539,6 +533,12 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
_process_drivers_and_hardware_types(CONF, env_data)
_process_ipa_args(CONF, env_data)
if not CONF.get('enable_nova', True):
deploy_args += [
'-e', os.path.join(
tht_templates, 'environments/undercloud-disable-nova.yaml')
]
if CONF.get('enable_mistral'):
deploy_args += ['-e', os.path.join(
tht_templates, "environments/services/mistral.yaml")]