openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Disable nova by default on undercloud"

This commit is contained in:
Zuul 2020-09-07 11:06:38 +00:00 committed by Gerrit Code Review
parent c5e1d30971 30bc8b15b0
commit 4dec4fa729
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/config/undercloud.py
View File

@ -75,7 +75,7 @@ class UndercloudConfig(StandaloneConfig):
ironic=True,
ironic_inspector=True,
mistral=True,
nova=True,
nova=False,
novajoin=False,
tempest=True,
telemetry=False,

2
tripleoclient/tests/config/test_config_undercloud.py
View File

@ -172,7 +172,7 @@ class TestUndercloudConfig(base.TestCase):
'enable_ironic': True,
'enable_ironic_inspector': True,
'enable_mistral': True,
'enable_nova': True,
'enable_nova': False,
'enable_novajoin': False,
'enable_telemetry': False,
'enable_tempest': True,

4
tripleoclient/v1/undercloud_config.py
View File

@ -608,10 +608,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
_process_drivers_and_hardware_types(CONF, env_data)
_process_ipa_args(CONF, env_data)
if not CONF.get('enable_nova', True):
if CONF.get('enable_nova'):
deploy_args += [
'-e', os.path.join(
tht_templates, 'environments/undercloud-disable-nova.yaml')
tht_templates, 'environments/undercloud-enable-nova.yaml')
]
if CONF.get('enable_mistral'):