Merge "Disable nova by default on undercloud"
This commit is contained in:
commit
4dec4fa729
tripleoclient
@ -75,7 +75,7 @@ class UndercloudConfig(StandaloneConfig):
|
||||
ironic=True,
|
||||
ironic_inspector=True,
|
||||
mistral=True,
|
||||
nova=True,
|
||||
nova=False,
|
||||
novajoin=False,
|
||||
tempest=True,
|
||||
telemetry=False,
|
||||
|
@ -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,
|
||||
|
@ -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'):
|
||||
|
Loading…
x
Reference in New Issue
Block a user