Deprecate and unwire enable_nova UC option

Since Wallaby Nova services aren't required in the Undercloud,
therefore deprecate the enable_nova flag from the undercloud.conf.

The undercloud-enable-nova.yaml env file will no longer be added
to the deployment command, even if enable_nova is set in the config.

Related-bug: #1959662
Change-Id: I29e1b1b6ad1b5b3664f608a780512e1cbe3acacf
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit a3c8ecf325)
This commit is contained in:
Bogdan Dobrelya 2022-02-01 10:50:06 +01:00 committed by Jose Luis Franco
parent 6c76392b62
commit 9fd8583f30
2 changed files with 6 additions and 4 deletions

View File

@ -76,6 +76,9 @@ class StandaloneConfig(BaseConfig):
),
cfg.BoolOpt('enable_nova',
default=nova,
deprecated_for_removal=True,
deprecated_reason=_('Nova can no longer be enabled '
'via the config settings.'),
help=_('Whether to enable the nova service.')),
cfg.BoolOpt('enable_novajoin',
default=novajoin,

View File

@ -620,10 +620,9 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
_process_ipa_args(CONF, env_data)
if CONF.get('enable_nova'):
deploy_args += [
'-e', os.path.join(
tht_templates, 'environments/undercloud-enable-nova.yaml')
]
LOG.warning('Nova has been deprecated and no longer be installed '
'using the enable_nova. Please remove it from '
'undercloud.conf.')
if CONF.get('enable_novajoin'):
LOG.warning('Novajoin has been deprecated and no longer be installed '