Merge "Remove undercloud_update_packages"
This commit is contained in:
commit
5face64ed5
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Remove `undercloud_update_packages` option in undercloud.conf.
|
|
@ -276,13 +276,6 @@ class UndercloudConfig(StandaloneConfig):
|
||||||
default=True,
|
default=True,
|
||||||
help=_('Enable or disable SELinux during the '
|
help=_('Enable or disable SELinux during the '
|
||||||
'deployment.')),
|
'deployment.')),
|
||||||
cfg.BoolOpt('undercloud_update_packages',
|
|
||||||
default=False,
|
|
||||||
help=_(
|
|
||||||
'Whether to update packages during the Undercloud '
|
|
||||||
'install. This is a no-op for containerized '
|
|
||||||
'undercloud.')
|
|
||||||
),
|
|
||||||
cfg.StrOpt('ipa_otp',
|
cfg.StrOpt('ipa_otp',
|
||||||
default='',
|
default='',
|
||||||
help=_(
|
help=_(
|
||||||
|
|
|
@ -75,8 +75,7 @@ class TestUndercloudConfig(base.TestCase):
|
||||||
'undercloud_ntp_servers',
|
'undercloud_ntp_servers',
|
||||||
'undercloud_public_host',
|
'undercloud_public_host',
|
||||||
'undercloud_service_certificate',
|
'undercloud_service_certificate',
|
||||||
'undercloud_timezone',
|
'undercloud_timezone']
|
||||||
'undercloud_update_packages']
|
|
||||||
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):
|
||||||
|
@ -141,8 +140,7 @@ class TestUndercloudConfig(base.TestCase):
|
||||||
'undercloud_ntp_servers',
|
'undercloud_ntp_servers',
|
||||||
'undercloud_public_host',
|
'undercloud_public_host',
|
||||||
'undercloud_service_certificate',
|
'undercloud_service_certificate',
|
||||||
'undercloud_timezone',
|
'undercloud_timezone']
|
||||||
'undercloud_update_packages']
|
|
||||||
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):
|
||||||
|
|
Loading…
Reference in New Issue