undercloud: wire ContainerHealthcheckDisabled
Add a new parameter to undercloud.conf to disable the container healthchecks. The parameter is: container_healthcheck_disabled and it's False by default, so the healthchecks are enabled by default. Depends-On: Id8d7e21d58cf5ab155404db597d96665b94d7c2a Change-Id: Icebfad41cc286a2e209511c147d74f1a933c66a2
This commit is contained in:
@@ -319,6 +319,11 @@ class UndercloudConfig(StandaloneConfig):
|
|||||||
'(Experimental) Whether to clean undercloud rpms '
|
'(Experimental) Whether to clean undercloud rpms '
|
||||||
'after an upgrade to a containerized '
|
'after an upgrade to a containerized '
|
||||||
'undercloud.')),
|
'undercloud.')),
|
||||||
|
cfg.BoolOpt('container_healthcheck_disabled',
|
||||||
|
default=False,
|
||||||
|
help=_(
|
||||||
|
'Whether or not we disable the container '
|
||||||
|
'healthchecks.')),
|
||||||
cfg.ListOpt('enabled_hardware_types',
|
cfg.ListOpt('enabled_hardware_types',
|
||||||
default=['ipmi', 'redfish', 'ilo', 'idrac'],
|
default=['ipmi', 'redfish', 'ilo', 'idrac'],
|
||||||
help=_('List of enabled bare metal hardware types '
|
help=_('List of enabled bare metal hardware types '
|
||||||
|
@@ -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.
|
@@ -30,6 +30,7 @@ class TestUndercloudConfig(base.TestCase):
|
|||||||
'clean_nodes',
|
'clean_nodes',
|
||||||
'cleanup',
|
'cleanup',
|
||||||
'container_cli',
|
'container_cli',
|
||||||
|
'container_healthcheck_disabled',
|
||||||
'container_images_file',
|
'container_images_file',
|
||||||
'container_insecure_registries',
|
'container_insecure_registries',
|
||||||
'container_registry_mirror',
|
'container_registry_mirror',
|
||||||
@@ -84,6 +85,7 @@ class TestUndercloudConfig(base.TestCase):
|
|||||||
'clean_nodes',
|
'clean_nodes',
|
||||||
'cleanup',
|
'cleanup',
|
||||||
'container_cli',
|
'container_cli',
|
||||||
|
'container_healthcheck_disabled',
|
||||||
'container_images_file',
|
'container_images_file',
|
||||||
'container_insecure_registries',
|
'container_insecure_registries',
|
||||||
'container_registry_mirror',
|
'container_registry_mirror',
|
||||||
|
@@ -69,6 +69,7 @@ PARAMETER_MAPPING = {
|
|||||||
'local_mtu': 'UndercloudLocalMtu',
|
'local_mtu': 'UndercloudLocalMtu',
|
||||||
'clean_nodes': 'IronicAutomatedClean',
|
'clean_nodes': 'IronicAutomatedClean',
|
||||||
'upgrade_cleanup': 'UpgradeRemoveUnusedPackages',
|
'upgrade_cleanup': 'UpgradeRemoveUnusedPackages',
|
||||||
|
'container_healthcheck_disabled': 'ContainerHealthcheckDisabled',
|
||||||
'local_subnet': 'UndercloudCtlplaneLocalSubnet',
|
'local_subnet': 'UndercloudCtlplaneLocalSubnet',
|
||||||
'enable_routed_networks': 'UndercloudEnableRoutedNetworks',
|
'enable_routed_networks': 'UndercloudEnableRoutedNetworks',
|
||||||
'local_interface': 'NeutronPublicInterface',
|
'local_interface': 'NeutronPublicInterface',
|
||||||
|
Reference in New Issue
Block a user