openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Add new toggle to disable Swift"

This commit is contained in:
Zuul 2020-12-02 04:19:34 +00:00 committed by Gerrit Code Review
parent 54a6f7eaf4 a139d43625
commit 10a5c9b66b
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tripleoclient/config/standalone.py
View File

@ -53,9 +53,9 @@ class StandaloneConfig(BaseConfig):
def get_enable_service_opts(self, cinder=False, ironic=False,
ironic_inspector=False, mistral=False,
nova=False, novajoin=False, tempest=False,
telemetry=False, validations=False,
zaqar=False):
nova=False, novajoin=False, swift=False,
tempest=False, telemetry=False,
validations=False, zaqar=False):
_opts = [
# service enablement
cfg.BoolOpt('enable_cinder',
@ -82,6 +82,11 @@ class StandaloneConfig(BaseConfig):
help=_('Whether to install novajoin metadata service '
'in the Undercloud.')
),
cfg.BoolOpt('enable_swift',
default=swift,
help=_('Whether to install Swift services in the '
'Undercloud.')
),
cfg.BoolOpt('enable_tempest',
default=tempest,
help=_('Whether to install Tempest in the Undercloud.'

1
tripleoclient/config/undercloud.py
View File

@ -77,6 +77,7 @@ class UndercloudConfig(StandaloneConfig):
mistral=False,
nova=False,
novajoin=False,
swift=True,
tempest=True,
telemetry=False,
validations=True,

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

@ -51,6 +51,7 @@ class TestStandaloneConfig(base.TestCase):
'enable_mistral',
'enable_nova',
'enable_novajoin',
'enable_swift',
'enable_telemetry',
'enable_tempest',
'enable_validations',
@ -66,6 +67,7 @@ class TestStandaloneConfig(base.TestCase):
mistral=True,
nova=True,
novajoin=True,
swift=True,
telemetry=True,
tempest=True,
validations=True,
@ -76,6 +78,7 @@ class TestStandaloneConfig(base.TestCase):
'enable_mistral',
'enable_nova',
'enable_novajoin',
'enable_swift',
'enable_telemetry',
'enable_tempest',
'enable_validations',
@ -100,6 +103,7 @@ class TestStandaloneConfig(base.TestCase):
'enable_mistral',
'enable_nova',
'enable_novajoin',
'enable_swift',
'enable_telemetry',
'enable_tempest',
'enable_validations',

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

@ -100,6 +100,7 @@ class TestUndercloudConfig(base.TestCase):
'enable_nova',
'enable_novajoin',
'enable_routed_networks',
'enable_swift',
'enable_swift_encryption',
'enable_telemetry',
'enable_tempest',
@ -169,6 +170,7 @@ class TestUndercloudConfig(base.TestCase):
'enable_nova': False,
'enable_novajoin': False,
'enable_telemetry': False,
'enable_swift': True,
'enable_tempest': True,
'enable_validations': True,
'enable_zaqar': False}

4
tripleoclient/v1/undercloud_config.py
View File

@ -646,6 +646,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
deploy_args += ['-e', os.path.join(
tht_templates, "environments/services/zaqar-swift-backend.yaml")]
if not CONF.get('enable_swift'):
deploy_args += ['-e', os.path.join(
tht_templates, "environments/disable-swift.yaml")]
if CONF.get('enable_telemetry'):
for env_file in TELEMETRY_DOCKER_ENV_YAML:
deploy_args += ['-e', os.path.join(tht_templates, env_file)]