openstack/python-tripleoclient
Code Issues Proposed changes

Log deprecation of enable_heat option.

Browse Source 
The enable_heat option has been deprecated in [0], so
let's suggest its removal if the parameter is still present
in the undercloud.conf.

[0] - 9ae6487b6d8b7c2dd81a0d2ba61014d02dbe7177

Depends-On: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/827955
(cherry picked from commit 1c3d290307993109e4c1169a4919a9cad66f72d2)
Change-Id: Ib6ab8adc12b3604cc7127e3292a39d57910b08ae
This commit is contained in:
Jose Luis Franco Arza 2022-01-27 16:04:26 +01:00 committed by Jose Luis Franco
parent ef151db52e
commit 10a6a7df1c
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

@ -110,6 +110,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

@ -92,8 +92,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',
@ -155,8 +153,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/'
@ -319,8 +315,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',
@ -385,8 +379,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',
@ -447,8 +439,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',
@ -506,8 +496,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',
@ -601,8 +589,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',
@ -691,8 +677,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',
@ -757,8 +741,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',
@ -822,8 +804,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',
@ -885,8 +865,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',
@ -954,8 +932,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

@ -640,9 +640,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(