Switch overcloud to software-config

This migrates the overcloud to using OS::Heat::StructuredConfig and
OS::Heat::StructuredDeployment. With those tools, we can decouple
servers from software configuration and begin to deprecate features in
tripleo_heat_merge.

Change-Id: Ice85f0711e90d0fabf1d1bc4698201c4d6758508

1 files changed, 45 insertions, 0 deletions

diff --git a/swift-deploy.yaml b/swift-deploy.yaml
new file mode 100644
index 00000000..1e96928f
--- /dev/null
+++ b/swift-deploy.yaml
@@ -0,0 +1,45 @@
+Description: 'Swift-proxy: OpenStack object storage proxy'
+Parameters:
+  SwiftHashSuffix:
+    Default: unset
+    Description: A random string to be used as a salt when hashing to determine mappings in the ring.
+    Type: String
+    NoEcho: true
+  SwiftPassword:
+    Default: unset
+    Description: The password for the swift service account, used by the swift proxy services.
+    Type: String
+    NoEcho: true
+Resources:
+  controller0Swift:
+    Type: OS::Heat::StructuredDeployment
+    Properties:
+      config: {Ref: SwiftConfig}
+      server: {Ref: controller0}
+      signal_transport: NO_SIGNAL
+      input_values:
+        swift_hash_suffix: {Ref: SwiftHashSuffix}
+        swift_password: {Ref: SwiftPassword}
+        swift_devices:
+          Fn::Join:
+          - ', '
+          - - Fn::Join:
+              - ''
+              - - 'r1z1-'
+                - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
+                - ':%PORT%/d1'
+            - Fn::Join:
+              - ', '
+              - Merge::Map:
+                  SwiftStorage0:
+                    Fn::Join:
+                    - ''
+                    - - 'r1z1-'
+                      - Fn::Select:
+                        - 0
+                        - Fn::Select:
+                          - 'ctlplane'
+                          - Fn::GetAtt:
+                            - SwiftStorage0
+                            - networks
+                      - ':%PORT%/d1'