Remove upgrade_cleanup
Support for this was removed in THT several releases ago and it was only for the initial non-containerized undercloud to containerized undercloud. Change-Id: I8583f795beaf0d6282cf4c836b7f597da35fb650
This commit is contained in:
parent
eba9a5e43b
commit
61786b4d09
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
`upgrade_cleanup` has been removed from the undercloud.conf as it hasn't
|
||||||
|
had any effect after the initial containerized undercloud back in Rocky
|
||||||
|
or FFU upgrade in Train.
|
|
@ -309,12 +309,6 @@ class UndercloudConfig(StandaloneConfig):
|
||||||
'Whether to clean overcloud nodes (wipe the hard '
|
'Whether to clean overcloud nodes (wipe the hard '
|
||||||
'drive) between deployments and after the '
|
'drive) between deployments and after the '
|
||||||
'introspection.')),
|
'introspection.')),
|
||||||
cfg.BoolOpt('upgrade_cleanup',
|
|
||||||
default=False,
|
|
||||||
help=_(
|
|
||||||
'(Experimental) Whether to clean undercloud rpms '
|
|
||||||
'after an upgrade to a containerized '
|
|
||||||
'undercloud.')),
|
|
||||||
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 '
|
||||||
|
|
|
@ -76,8 +76,7 @@ class TestUndercloudConfig(base.TestCase):
|
||||||
'undercloud_public_host',
|
'undercloud_public_host',
|
||||||
'undercloud_service_certificate',
|
'undercloud_service_certificate',
|
||||||
'undercloud_timezone',
|
'undercloud_timezone',
|
||||||
'undercloud_update_packages',
|
'undercloud_update_packages']
|
||||||
'upgrade_cleanup']
|
|
||||||
self.assertEqual(expected, [x.name for x in ret])
|
self.assertEqual(expected, [x.name for x in ret])
|
||||||
|
|
||||||
def test_get_opts(self):
|
def test_get_opts(self):
|
||||||
|
@ -143,8 +142,7 @@ class TestUndercloudConfig(base.TestCase):
|
||||||
'undercloud_public_host',
|
'undercloud_public_host',
|
||||||
'undercloud_service_certificate',
|
'undercloud_service_certificate',
|
||||||
'undercloud_timezone',
|
'undercloud_timezone',
|
||||||
'undercloud_update_packages',
|
'undercloud_update_packages']
|
||||||
'upgrade_cleanup']
|
|
||||||
self.assertEqual(expected, [x.name for x in ret])
|
self.assertEqual(expected, [x.name for x in ret])
|
||||||
|
|
||||||
def test_get_subnet_opts(self):
|
def test_get_subnet_opts(self):
|
||||||
|
|
|
@ -68,7 +68,6 @@ PARAMETER_MAPPING = {
|
||||||
'scheduler_max_attempts': 'NovaSchedulerMaxAttempts',
|
'scheduler_max_attempts': 'NovaSchedulerMaxAttempts',
|
||||||
'local_mtu': 'UndercloudLocalMtu',
|
'local_mtu': 'UndercloudLocalMtu',
|
||||||
'clean_nodes': 'IronicAutomatedClean',
|
'clean_nodes': 'IronicAutomatedClean',
|
||||||
'upgrade_cleanup': 'UpgradeRemoveUnusedPackages',
|
|
||||||
'container_healthcheck_disabled': 'ContainerHealthcheckDisabled',
|
'container_healthcheck_disabled': 'ContainerHealthcheckDisabled',
|
||||||
'local_subnet': 'UndercloudCtlplaneLocalSubnet',
|
'local_subnet': 'UndercloudCtlplaneLocalSubnet',
|
||||||
'enable_routed_networks': 'UndercloudEnableRoutedNetworks',
|
'enable_routed_networks': 'UndercloudEnableRoutedNetworks',
|
||||||
|
|
Loading…
Reference in New Issue