Merge "undercloud: wire ContainerHealthcheckDisabled"

tripleoclient/config/undercloud.py

@@ -319,6 +319,11 @@ class UndercloudConfig(StandaloneConfig):
                             '(Experimental) Whether to clean undercloud rpms '
                             'after an upgrade to a containerized '
                             'undercloud.')),
+            cfg.BoolOpt('container_healthcheck_disabled',
+                        default=False,
+                        help=_(
+                            'Whether or not we disable the container '
+                            'healthchecks.')),
             cfg.ListOpt('enabled_hardware_types',
                         default=['ipmi', 'redfish', 'ilo', 'idrac'],
                         help=_('List of enabled bare metal hardware types '

tripleoclient/releasenotes/notes/healthcheck_disabled-d0878072273d1496.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Disable the container healthchecks on the Undercloud in the undercloud.conf
+    with the new option container_healthcheck_disabled, false by default.

tripleoclient/tests/config/test_config_undercloud.py

@@ -30,6 +30,7 @@ class TestUndercloudConfig(base.TestCase):
                     'clean_nodes',
                     'cleanup',
                     'container_cli',
+                    'container_healthcheck_disabled',
                     'container_images_file',
                     'container_insecure_registries',
                     'container_registry_mirror',
@@ -84,6 +85,7 @@ class TestUndercloudConfig(base.TestCase):
                     'clean_nodes',
                     'cleanup',
                     'container_cli',
+                    'container_healthcheck_disabled',
                     'container_images_file',
                     'container_insecure_registries',
                     'container_registry_mirror',

tripleoclient/v1/undercloud_config.py

@@ -69,6 +69,7 @@ PARAMETER_MAPPING = {
     'local_mtu': 'UndercloudLocalMtu',
     'clean_nodes': 'IronicAutomatedClean',
     'upgrade_cleanup': 'UpgradeRemoveUnusedPackages',
+    'container_healthcheck_disabled': 'ContainerHealthcheckDisabled',
     'local_subnet': 'UndercloudCtlplaneLocalSubnet',
     'enable_routed_networks': 'UndercloudEnableRoutedNetworks',
     'local_interface': 'NeutronPublicInterface',