openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Log deprecation of enable_heat option." into stable/wallaby

Browse Source
This commit is contained in:
Zuul 2022-02-10 19:04:00 +00:00 committed by Gerrit Code Review
commit 5b2cc6e948
3 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/config/standalone.py
View File

@ -106,6 +106,10 @@ class StandaloneConfig(BaseConfig):
help=_('Whether to enable the neutron service.')), help=_('Whether to enable the neutron service.')),
cfg.BoolOpt('enable_heat', cfg.BoolOpt('enable_heat',
default=heat, default=heat,
deprecated_for_removal=True,
deprecated_reason=('Heat has been replaced by the '
'heat-ephemeral service and this '
'option has been deprecated.'),
help=_('Whether to enable the heat service.')), help=_('Whether to enable the heat service.')),
] ]

24
tripleoclient/tests/v1/undercloud/test_install_upgrade.py
View File

@ -91,8 +91,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',
@ -154,8 +152,6 @@ class TestUndercloudInstall(TestPluginV1):
'/home/stack/foo.yaml', '-e', '/home/stack/foo.yaml', '-e',
'/usertht/environments/services/ironic.yaml', '-e', '/usertht/environments/services/ironic.yaml', '-e',
'/usertht/environments/services/ironic-inspector.yaml', '-e', '/usertht/environments/services/ironic-inspector.yaml', '-e',
'/usertht/environments/'
'disable-heat.yaml', '-e',
'/usertht/environments/services/' '/usertht/environments/services/'
'undercloud-remove-novajoin.yaml', '-e', 'undercloud-remove-novajoin.yaml', '-e',
'/usertht/environments/' '/usertht/environments/'
@ -318,8 +314,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',
@ -384,8 +378,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',
@ -446,8 +438,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',
@ -505,8 +495,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',
@ -599,8 +587,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',
@ -688,8 +674,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',
@ -754,8 +738,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',
@ -819,8 +801,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',
@ -882,8 +862,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',
@ -951,8 +929,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic-inspector.yaml', '-e', 'services/ironic-inspector.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-heat.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e', 'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/' '/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e', 'disable-telemetry.yaml', '-e',

7
tripleoclient/v1/undercloud_config.py
View File

@ -634,9 +634,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
deploy_args += ['-e', os.path.join( deploy_args += ['-e', os.path.join(
tht_templates, "environments/disable-neutron.yaml")] tht_templates, "environments/disable-neutron.yaml")]
if not CONF.get('enable_heat'): if CONF.get('enable_heat'):
deploy_args += ['-e', os.path.join( LOG.warning('enable_heat has been deprecated. Ephemeral heat '
tht_templates, "environments/disable-heat.yaml")] 'is now deployed by default. Please remove the '
'option from undercloud.conf.')
if CONF.get('ipa_otp'): if CONF.get('ipa_otp'):
deploy_args += ['-e', os.path.join( deploy_args += ['-e', os.path.join(