Remove zaqar
Additional zaqar cleanup Change-Id: I9f354f4c63458ef077f1d72aafa14c69e5ba02f6
This commit is contained in:
parent
081922a6ba
commit
40d1be0aa8
|
@ -55,8 +55,7 @@ class StandaloneConfig(BaseConfig):
|
||||||
ironic_inspector=False,
|
ironic_inspector=False,
|
||||||
nova=False, novajoin=False, swift=False,
|
nova=False, novajoin=False, swift=False,
|
||||||
telemetry=False, validations=False,
|
telemetry=False, validations=False,
|
||||||
zaqar=False, neutron=False, heat=False,
|
neutron=False, heat=False, keystone=True):
|
||||||
keystone=True):
|
|
||||||
_opts = [
|
_opts = [
|
||||||
# service enablement
|
# service enablement
|
||||||
cfg.BoolOpt('enable_cinder',
|
cfg.BoolOpt('enable_cinder',
|
||||||
|
@ -99,12 +98,6 @@ class StandaloneConfig(BaseConfig):
|
||||||
'Whether to install requirements to run the '
|
'Whether to install requirements to run the '
|
||||||
'TripleO validations.')
|
'TripleO validations.')
|
||||||
),
|
),
|
||||||
cfg.BoolOpt('enable_zaqar',
|
|
||||||
default=zaqar,
|
|
||||||
deprecated_for_removal=True,
|
|
||||||
deprecated_reason=('Support for the zaqar service '
|
|
||||||
'has been deprecated.'),
|
|
||||||
help=_('Whether to enable the zaqar service.')),
|
|
||||||
cfg.BoolOpt('enable_neutron',
|
cfg.BoolOpt('enable_neutron',
|
||||||
default=neutron,
|
default=neutron,
|
||||||
help=_('Whether to enable the neutron service.')),
|
help=_('Whether to enable the neutron service.')),
|
||||||
|
|
|
@ -81,8 +81,7 @@ class UndercloudConfig(StandaloneConfig):
|
||||||
novajoin=False,
|
novajoin=False,
|
||||||
swift=False,
|
swift=False,
|
||||||
telemetry=False,
|
telemetry=False,
|
||||||
validations=True,
|
validations=True)
|
||||||
zaqar=False)
|
|
||||||
|
|
||||||
def get_base_opts(self):
|
def get_base_opts(self):
|
||||||
_base_opts = super(UndercloudConfig, self).get_base_opts()
|
_base_opts = super(UndercloudConfig, self).get_base_opts()
|
||||||
|
|
|
@ -56,8 +56,7 @@ class TestStandaloneConfig(base.TestCase):
|
||||||
'enable_novajoin',
|
'enable_novajoin',
|
||||||
'enable_swift',
|
'enable_swift',
|
||||||
'enable_telemetry',
|
'enable_telemetry',
|
||||||
'enable_validations',
|
'enable_validations']
|
||||||
'enable_zaqar']
|
|
||||||
self.assertEqual(expected, [x.name for x in ret])
|
self.assertEqual(expected, [x.name for x in ret])
|
||||||
for x in ret:
|
for x in ret:
|
||||||
if x.name == 'enable_keystone':
|
if x.name == 'enable_keystone':
|
||||||
|
@ -79,8 +78,7 @@ class TestStandaloneConfig(base.TestCase):
|
||||||
novajoin=True,
|
novajoin=True,
|
||||||
swift=True,
|
swift=True,
|
||||||
telemetry=True,
|
telemetry=True,
|
||||||
validations=True,
|
validations=True)
|
||||||
zaqar=True)
|
|
||||||
expected = ['enable_cinder',
|
expected = ['enable_cinder',
|
||||||
'enable_frr',
|
'enable_frr',
|
||||||
'enable_heat',
|
'enable_heat',
|
||||||
|
@ -92,8 +90,7 @@ class TestStandaloneConfig(base.TestCase):
|
||||||
'enable_novajoin',
|
'enable_novajoin',
|
||||||
'enable_swift',
|
'enable_swift',
|
||||||
'enable_telemetry',
|
'enable_telemetry',
|
||||||
'enable_validations',
|
'enable_validations']
|
||||||
'enable_zaqar']
|
|
||||||
self.assertEqual(expected, [x.name for x in ret])
|
self.assertEqual(expected, [x.name for x in ret])
|
||||||
for x in ret:
|
for x in ret:
|
||||||
self.assertEqual(x.default, True, "%s config not True" % x.name)
|
self.assertEqual(x.default, True, "%s config not True" % x.name)
|
||||||
|
@ -120,7 +117,6 @@ class TestStandaloneConfig(base.TestCase):
|
||||||
'enable_swift',
|
'enable_swift',
|
||||||
'enable_telemetry',
|
'enable_telemetry',
|
||||||
'enable_validations',
|
'enable_validations',
|
||||||
'enable_zaqar',
|
|
||||||
'heat_container_image',
|
'heat_container_image',
|
||||||
'heat_native',
|
'heat_native',
|
||||||
'hieradata_override',
|
'hieradata_override',
|
||||||
|
|
|
@ -109,7 +109,6 @@ class TestUndercloudConfig(base.TestCase):
|
||||||
'enable_swift_encryption',
|
'enable_swift_encryption',
|
||||||
'enable_telemetry',
|
'enable_telemetry',
|
||||||
'enable_validations',
|
'enable_validations',
|
||||||
'enable_zaqar',
|
|
||||||
'enabled_hardware_types',
|
'enabled_hardware_types',
|
||||||
'generate_service_certificate',
|
'generate_service_certificate',
|
||||||
'heat_container_image',
|
'heat_container_image',
|
||||||
|
@ -178,8 +177,7 @@ class TestUndercloudConfig(base.TestCase):
|
||||||
'enable_novajoin': False,
|
'enable_novajoin': False,
|
||||||
'enable_telemetry': False,
|
'enable_telemetry': False,
|
||||||
'enable_swift': False,
|
'enable_swift': False,
|
||||||
'enable_validations': True,
|
'enable_validations': True}
|
||||||
'enable_zaqar': False}
|
|
||||||
self.assertEqual(sorted(expected.keys()), [x.name for x in ret])
|
self.assertEqual(sorted(expected.keys()), [x.name for x in ret])
|
||||||
for x in ret:
|
for x in ret:
|
||||||
self.assertEqual(expected[x.name], x.default, "%s config not %s" %
|
self.assertEqual(expected[x.name], x.default, "%s config not %s" %
|
||||||
|
|
|
@ -636,10 +636,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
|
||||||
tht_templates, 'environments/services/undercloud-remove-novajoin.yaml')
|
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'):
|
if CONF.get('enable_swift'):
|
||||||
deploy_args += ['-e', os.path.join(
|
deploy_args += ['-e', os.path.join(
|
||||||
tht_templates, "environments/undercloud-enable-swift.yaml")]
|
tht_templates, "environments/undercloud-enable-swift.yaml")]
|
||||||
|
|
Loading…
Reference in New Issue