Merge "Remove undercloud_enable_paunch option"

releasenotes/notes/paunch_retiring-eed2580b80dcbe74.yaml

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

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=_(

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',

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()

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']