openstack
/
python-tripleoclient
Code Issues Proposed changes

Allow enabling swift on undercloud 

If swift is needed on the undercloud, specifically for missing
use case, it can be enabled.

Depends-On: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/772967
Change-Id: I70469b29b71746fcfdb6382c080baf836c61f2ef
This commit is contained in:
ramishra 2021-01-29 08:40:29 +05:30
parent 11a1737214
commit 3739872bcd
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tripleoclient/tests/v1/undercloud/test_install_upgrade.py
View File

@ -95,8 +95,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-swift.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e',
@ -164,8 +162,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usertht/environments/services/'
'undercloud-remove-novajoin.yaml', '-e',
'/usertht/environments/'
'disable-swift.yaml', '-e',
'/usertht/environments/'
'disable-telemetry.yaml', '-e',
'/usertht/environments/services/tempest.yaml', '-e',
'/usertht/environments/public-tls-undercloud.yaml',
@ -330,8 +326,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-swift.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e',
@ -401,8 +395,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-swift.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e',
@ -468,8 +460,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-swift.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e',
@ -532,8 +522,6 @@ class TestUndercloudInstall(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-swift.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e',
@ -686,8 +674,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-swift.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e',
@ -757,8 +743,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-swift.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e',
@ -827,8 +811,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-swift.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e',
@ -895,8 +877,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-swift.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e',
@ -969,8 +949,6 @@ class TestUndercloudUpgrade(TestPluginV1):
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/undercloud-remove-novajoin.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-swift.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'disable-telemetry.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/tempest.yaml', '-e',

4
tripleoclient/v1/undercloud_config.py
View File

@ -648,9 +648,9 @@ 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'):
if CONF.get('enable_swift'):
deploy_args += ['-e', os.path.join(
tht_templates, "environments/disable-swift.yaml")]
tht_templates, "environments/undercloud-enable-swift.yaml")]
if CONF.get('enable_telemetry'):
for env_file in TELEMETRY_DOCKER_ENV_YAML: