From 2edb378bb04a55f0b749ba502d0ff8e637dbb680 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 28 May 2020 11:37:23 -0400 Subject: [PATCH] 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 --- releasenotes/notes/paunch_retiring-eed2580b80dcbe74.yaml | 4 ++++ tripleoclient/config/undercloud.py | 4 ---- tripleoclient/tests/config/test_config_undercloud.py | 2 -- tripleoclient/v1/tripleo_deploy.py | 2 +- tripleoclient/v1/undercloud_config.py | 5 ----- 5 files changed, 5 insertions(+), 12 deletions(-) create mode 100644 releasenotes/notes/paunch_retiring-eed2580b80dcbe74.yaml diff --git a/releasenotes/notes/paunch_retiring-eed2580b80dcbe74.yaml b/releasenotes/notes/paunch_retiring-eed2580b80dcbe74.yaml new file mode 100644 index 000000000..ba7583698 --- /dev/null +++ b/releasenotes/notes/paunch_retiring-eed2580b80dcbe74.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + undercloud_enable_paunch option is removed as we retire Paunch project. diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py index 1b84219b8..59130bb8e 100644 --- a/tripleoclient/config/undercloud.py +++ b/tripleoclient/config/undercloud.py @@ -283,10 +283,6 @@ class UndercloudConfig(StandaloneConfig): default=True, help=_('Enable or disable SELinux during the ' 'deployment.')), - cfg.BoolOpt('undercloud_enable_paunch', - default=False, - help=_('Enable or disable Paunch to manage ' - 'containers.')), cfg.BoolOpt('undercloud_update_packages', default=False, help=_( diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py index 490f69da4..1ae891f6c 100644 --- a/tripleoclient/tests/config/test_config_undercloud.py +++ b/tripleoclient/tests/config/test_config_undercloud.py @@ -69,7 +69,6 @@ class TestUndercloudConfig(base.TestCase): 'templates', 'undercloud_admin_host', 'undercloud_debug', - 'undercloud_enable_paunch', 'undercloud_enable_selinux', 'undercloud_hostname', 'undercloud_log_file', @@ -138,7 +137,6 @@ class TestUndercloudConfig(base.TestCase): 'templates', 'undercloud_admin_host', 'undercloud_debug', - 'undercloud_enable_paunch', 'undercloud_enable_selinux', 'undercloud_hostname', 'undercloud_log_file', diff --git a/tripleoclient/v1/tripleo_deploy.py b/tripleoclient/v1/tripleo_deploy.py index 5272cfc26..b6d20cb04 100644 --- a/tripleoclient/v1/tripleo_deploy.py +++ b/tripleoclient/v1/tripleo_deploy.py @@ -1422,6 +1422,6 @@ class Deploy(command.Command): # read by the deployment user and not only root. 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 utils.reset_cmdline() diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index 3a46f7177..64042e94d 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -486,11 +486,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True, else: 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): env_data['NtpServer'] = CONF['undercloud_ntp_servers']