openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Remove zaqar" into stable/wallaby

This commit is contained in:
Zuul 2021-10-12 01:13:00 +00:00 committed by Gerrit Code Review
parent ad498143fb 865841751e
commit 597e5baabd
5 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleoclient/config/standalone.py
View File

@ -55,7 +55,7 @@ class StandaloneConfig(BaseConfig):
ironic_inspector=False,
nova=False, novajoin=False, swift=False,
telemetry=False, validations=False,
zaqar=False, neutron=False, heat=False):
neutron=False, heat=False):
_opts = [
# service enablement
cfg.BoolOpt('enable_cinder',
@ -99,9 +99,6 @@ class StandaloneConfig(BaseConfig):
'Whether to install requirements to run the '
'TripleO validations.')
),
cfg.BoolOpt('enable_zaqar',
default=zaqar,
help=_('Whether to enable the zaqar service.')),
cfg.BoolOpt('enable_neutron',
default=neutron,
help=_('Whether to enable the neutron service.')),

3
tripleoclient/config/undercloud.py
View File

@ -80,8 +80,7 @@ class UndercloudConfig(StandaloneConfig):
novajoin=False,
swift=False,
telemetry=False,
validations=True,
zaqar=False)
validations=True)
def get_base_opts(self):
_base_opts = super(UndercloudConfig, self).get_base_opts()

10
tripleoclient/tests/config/test_config_standalone.py
View File

@ -53,8 +53,7 @@ class TestStandaloneConfig(base.TestCase):
'enable_novajoin',
'enable_swift',
'enable_telemetry',
'enable_validations',
'enable_zaqar']
'enable_validations']
self.assertEqual(expected, [x.name for x in ret])
for x in ret:
self.assertEqual(x.default, False, "%s config not False" % x.name)
@ -70,8 +69,7 @@ class TestStandaloneConfig(base.TestCase):
novajoin=True,
swift=True,
telemetry=True,
validations=True,
zaqar=True)
validations=True)
expected = ['enable_cinder',
'enable_frr',
'enable_heat',
@ -82,8 +80,7 @@ class TestStandaloneConfig(base.TestCase):
'enable_novajoin',
'enable_swift',
'enable_telemetry',
'enable_validations',
'enable_zaqar']
'enable_validations']
self.assertEqual(expected, [x.name for x in ret])
for x in ret:
self.assertEqual(x.default, True, "%s config not True" % x.name)
@ -109,7 +106,6 @@ class TestStandaloneConfig(base.TestCase):
'enable_swift',
'enable_telemetry',
'enable_validations',
'enable_zaqar',
'heat_container_image',
'heat_native',
'hieradata_override',

4
tripleoclient/tests/config/test_config_undercloud.py
View File

@ -108,7 +108,6 @@ class TestUndercloudConfig(base.TestCase):
'enable_swift_encryption',
'enable_telemetry',
'enable_validations',
'enable_zaqar',
'enabled_hardware_types',
'generate_service_certificate',
'heat_container_image',
@ -176,8 +175,7 @@ class TestUndercloudConfig(base.TestCase):
'enable_novajoin': False,
'enable_telemetry': False,
'enable_swift': False,
'enable_validations': True,
'enable_zaqar': False}
'enable_validations': True}
self.assertEqual(sorted(expected.keys()), [x.name for x in ret])
for x in ret:
self.assertEqual(expected[x.name], x.default, "%s config not %s" %

4
tripleoclient/v1/undercloud_config.py
View File

@ -650,10 +650,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
tht_templates, 'environments/services/undercloud-remove-novajoin.yaml')
]
if CONF.get('enable_zaqar'):
deploy_args += ['-e', os.path.join(
tht_templates, "environments/services/zaqar-swift-backend.yaml")]
if CONF.get('enable_swift'):
deploy_args += ['-e', os.path.join(
tht_templates, "environments/undercloud-enable-swift.yaml")]