From b3f4111c9ebb6ebd572b734a46b1d58e2875bd55 Mon Sep 17 00:00:00 2001
From: ramishra <ramishra@redhat.com>
Date: Fri, 29 Jan 2021 08:27:38 +0530
Subject: [PATCH] Disable swift on undercloud by default

This changes to disable swift by default on the undercloud.
Adds a new environment if there is a requirement to enable
it.

Depends-On: https://review.opendev.org/c/openstack/python-tripleoclient/+/772827/
Change-Id: I860e99af585aff6d1f5490930c364f091df81e56
---
 environments/undercloud-enable-swift.yaml | 12 ++++++++++++
 environments/undercloud.yaml              |  9 +++------
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 environments/undercloud-enable-swift.yaml

diff --git a/environments/undercloud-enable-swift.yaml b/environments/undercloud-enable-swift.yaml
new file mode 100644
index 0000000000..5b317f2457
--- /dev/null
+++ b/environments/undercloud-enable-swift.yaml
@@ -0,0 +1,12 @@
+parameter_defaults:
+  SwiftCorsAllowedOrigin: '*'
+  SwiftReplicas: 1
+  SwiftWorkers: 2
+  SwiftAccountWorkers: 2
+  SwiftContainerWorkers: 2
+  SwiftObjectWorkers: 2
+
+resource_registry:
+  OS::TripleO::Services::SwiftProxy: ../deployment/swift/swift-proxy-container-puppet.yaml
+  OS::TripleO::Services::SwiftStorage: ../deployment/swift/swift-storage-container-puppet.yaml
+  OS::TripleO::Services::SwiftRingBuilder: ../deployment/swift/swift-ringbuilder-container-puppet.yaml
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index 7716df0534..e870222585 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -48,6 +48,9 @@ resource_registry:
   OS::TripleO::Services::Logging::PlacementApi: OS::Heat::None
   OS::TripleO::Services::GlanceApi: OS::Heat::None
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
+  OS::TripleO::Services::SwiftProxy: OS::Heat::None
+  OS::TripleO::Services::SwiftStorage: OS::Heat::None
+  OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
 
   # Services we don't ever want configured. See LP#1824030
   OS::TripleO::Services::Pacemaker: OS::Heat::None
@@ -149,12 +152,6 @@ parameter_defaults:
   # This allows MTU > 1500 for the overcloud if local_mtu is set to 1500
   # See LP#1826729
   TenantNetPhysnetMtu: 0
-  SwiftCorsAllowedOrigin: '*'
-  SwiftReplicas: 1
-  SwiftWorkers: 2
-  SwiftAccountWorkers: 2
-  SwiftContainerWorkers: 2
-  SwiftObjectWorkers: 2
   # A list of static routes for the control plane network. Ensure traffic to
   # nodes on remote control plane networks use the correct network path.
   # Example: