diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py index 99972f85a..0b993aede 100644 --- a/tripleoclient/config/undercloud.py +++ b/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 ' diff --git a/tripleoclient/releasenotes/notes/healthcheck_disabled-d0878072273d1496.yaml b/tripleoclient/releasenotes/notes/healthcheck_disabled-d0878072273d1496.yaml new file mode 100644 index 000000000..a12ae0001 --- /dev/null +++ b/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. diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py index 293c2a551..f140c99d9 100644 --- a/tripleoclient/tests/config/test_config_undercloud.py +++ b/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', diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index 03a36d796..e6a706da0 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/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',