From 3739872bcdc1177c6eb648b45c270cf344f0ee67 Mon Sep 17 00:00:00 2001 From: ramishra Date: Fri, 29 Jan 2021 08:40:29 +0530 Subject: [PATCH] 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 --- .../v1/undercloud/test_install_upgrade.py | 22 ------------------- tripleoclient/v1/undercloud_config.py | 4 ++-- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py index 1078b7996..e895a4a18 100644 --- a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py +++ b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py @@ -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', diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index 9f28df795..0417a638e 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -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: