From 61786b4d091946717fa5e079e1876d53328e0b48 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 23 Oct 2020 13:07:44 -0600 Subject: [PATCH] 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 --- .../notes/remove-upgrade_cleanup-5b341a8a71394389.yaml | 6 ++++++ tripleoclient/config/undercloud.py | 6 ------ tripleoclient/tests/config/test_config_undercloud.py | 6 ++---- tripleoclient/v1/undercloud_config.py | 1 - 4 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 releasenotes/notes/remove-upgrade_cleanup-5b341a8a71394389.yaml diff --git a/releasenotes/notes/remove-upgrade_cleanup-5b341a8a71394389.yaml b/releasenotes/notes/remove-upgrade_cleanup-5b341a8a71394389.yaml new file mode 100644 index 000000000..2e93a1732 --- /dev/null +++ b/releasenotes/notes/remove-upgrade_cleanup-5b341a8a71394389.yaml @@ -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. diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py index 4216d7018..f8ed4c4ca 100644 --- a/tripleoclient/config/undercloud.py +++ b/tripleoclient/config/undercloud.py @@ -309,12 +309,6 @@ class UndercloudConfig(StandaloneConfig): 'Whether to clean overcloud nodes (wipe the hard ' 'drive) between deployments and after the ' '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', default=['ipmi', 'redfish', 'ilo', 'idrac'], help=_('List of enabled bare metal hardware types ' diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py index e67871b04..b292140a4 100644 --- a/tripleoclient/tests/config/test_config_undercloud.py +++ b/tripleoclient/tests/config/test_config_undercloud.py @@ -76,8 +76,7 @@ class TestUndercloudConfig(base.TestCase): 'undercloud_public_host', 'undercloud_service_certificate', 'undercloud_timezone', - 'undercloud_update_packages', - 'upgrade_cleanup'] + 'undercloud_update_packages'] self.assertEqual(expected, [x.name for x in ret]) def test_get_opts(self): @@ -143,8 +142,7 @@ class TestUndercloudConfig(base.TestCase): 'undercloud_public_host', 'undercloud_service_certificate', 'undercloud_timezone', - 'undercloud_update_packages', - 'upgrade_cleanup'] + 'undercloud_update_packages'] self.assertEqual(expected, [x.name for x in ret]) def test_get_subnet_opts(self): diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index e9a76cb0e..44d9b805c 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -68,7 +68,6 @@ PARAMETER_MAPPING = { 'scheduler_max_attempts': 'NovaSchedulerMaxAttempts', 'local_mtu': 'UndercloudLocalMtu', 'clean_nodes': 'IronicAutomatedClean', - 'upgrade_cleanup': 'UpgradeRemoveUnusedPackages', 'container_healthcheck_disabled': 'ContainerHealthcheckDisabled', 'local_subnet': 'UndercloudCtlplaneLocalSubnet', 'enable_routed_networks': 'UndercloudEnableRoutedNetworks',