Browse Source

Merge "Remove upgrade_cleanup"

changes/51/760351/1
Zuul 9 months ago
committed by Gerrit Code Review
parent
commit
03da56c949
  1. 6
      releasenotes/notes/remove-upgrade_cleanup-5b341a8a71394389.yaml
  2. 6
      tripleoclient/config/undercloud.py
  3. 6
      tripleoclient/tests/config/test_config_undercloud.py
  4. 1
      tripleoclient/v1/undercloud_config.py

6
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.

6
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 '

6
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):

1
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',

Loading…
Cancel
Save