Remove undercloud_enable_paunch option

undercloud_enable_paunch isn't needed anymore since we retire Paunch
project.

There is no need of deprecating the option since it would have no effect
if set in undercloud.conf.

Change-Id: I9972d3e9826422cd6ab56c801ff93c4d2dfc8404
This commit is contained in:
Emilien Macchi 2020-05-28 11:37:23 -04:00
parent c9b9d22dcc
commit 2edb378bb0
5 changed files with 5 additions and 12 deletions

View File

@ -0,0 +1,4 @@
---
deprecations:
- |
undercloud_enable_paunch option is removed as we retire Paunch project.

View File

@ -283,10 +283,6 @@ class UndercloudConfig(StandaloneConfig):
default=True, default=True,
help=_('Enable or disable SELinux during the ' help=_('Enable or disable SELinux during the '
'deployment.')), 'deployment.')),
cfg.BoolOpt('undercloud_enable_paunch',
default=False,
help=_('Enable or disable Paunch to manage '
'containers.')),
cfg.BoolOpt('undercloud_update_packages', cfg.BoolOpt('undercloud_update_packages',
default=False, default=False,
help=_( help=_(

View File

@ -69,7 +69,6 @@ class TestUndercloudConfig(base.TestCase):
'templates', 'templates',
'undercloud_admin_host', 'undercloud_admin_host',
'undercloud_debug', 'undercloud_debug',
'undercloud_enable_paunch',
'undercloud_enable_selinux', 'undercloud_enable_selinux',
'undercloud_hostname', 'undercloud_hostname',
'undercloud_log_file', 'undercloud_log_file',
@ -138,7 +137,6 @@ class TestUndercloudConfig(base.TestCase):
'templates', 'templates',
'undercloud_admin_host', 'undercloud_admin_host',
'undercloud_debug', 'undercloud_debug',
'undercloud_enable_paunch',
'undercloud_enable_selinux', 'undercloud_enable_selinux',
'undercloud_hostname', 'undercloud_hostname',
'undercloud_log_file', 'undercloud_log_file',

View File

@ -1422,6 +1422,6 @@ class Deploy(command.Command):
# read by the deployment user and not only root. # read by the deployment user and not only root.
utils.copy_clouds_yaml(parsed_args.deployment_user) utils.copy_clouds_yaml(parsed_args.deployment_user)
# send erase sequence to reset the cmdline if paunch/ansible # send erase sequence to reset the cmdline if ansible
# mangled some escape sequences # mangled some escape sequences
utils.reset_cmdline() utils.reset_cmdline()

View File

@ -486,11 +486,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
else: else:
env_data['SELinuxMode'] = 'permissive' env_data['SELinuxMode'] = 'permissive'
if CONF.get('undercloud_enable_paunch'):
env_data['EnablePaunch'] = True
else:
env_data['EnablePaunch'] = False
if CONF.get('undercloud_ntp_servers', None): if CONF.get('undercloud_ntp_servers', None):
env_data['NtpServer'] = CONF['undercloud_ntp_servers'] env_data['NtpServer'] = CONF['undercloud_ntp_servers']