Define and bind a public virtual IP

[apex-tripleo-heat-templates.git] / swift-storage-source.yaml

diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index 69236b2..d9df572 100644 (file)
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -18,17 +18,34 @@ Resources:
   SwiftStorage0:
     Type: OS::Nova::Server
     Properties:
-      image:
-        {Ref: SwiftStorageImage}
+      image: {Ref: SwiftStorageImage}
       flavor: {Ref: OvercloudSwiftStorageFlavor}
       key_name: {Ref: KeyName}
+      user_data_format: SOFTWARE_CONFIG
+  SwiftKeystoneConfig:
+    Type: OS::Heat::StructuredConfig
+    Properties:
+      config:
+        keystone:
+          host: {get_input: keystone_host}
+  SwiftStorage0Keystone:
+    Type: OS::Heat::StructuredDeployment
+    Properties:
+      server: {Ref: SwiftStorage0}
+      config: {Ref: SwiftKeystoneConfig}
+      signal_transport: NO_SIGNAL
+      input_values:
+        keystone_host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
   SwiftStorage0Deploy:
     Type: OS::Heat::StructuredDeployment
     Properties:
       server: {Ref: SwiftStorage0}
       config: {Ref: SwiftConfig}
+      signal_transport: NO_SIGNAL
       input_values:
         neutron_local_ip: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [SwiftStorage0, networks]} ]} ] }
+        swift_hash_suffix: {Ref: SwiftHashSuffix}
+        swift_password: {Ref: SwiftPassword}
         swift_devices:
           Fn::Join:
           - ', '
@@ -39,16 +56,37 @@ Resources:
                 - ':%PORT%/d1'
             - Fn::Join:
               - ', '
-              Merge::Map:
-                SwiftStorage0:
-                  Fn::Join:
-                  - ''
-                  - - 'r1z1-'
-                    - Fn::Select:
-                      - 0
+              - Merge::Map:
+                  SwiftStorage0:
+                    Fn::Join:
+                    - ''
+                    - - 'r1z1-'
                       - Fn::Select:
-                        - 'ctlplane'
-                        - Fn::GetAtt:
-                          - SwiftStorage0
-                          - networks
-                    - ':%PORT%/d1'
+                        - 0
+                        - Fn::Select:
+                          - 'ctlplane'
+                          - Fn::GetAtt:
+                            - SwiftStorage0
+                            - networks
+                      - ':%PORT%/d1'
+        swift_proxy_memcache:
+          Fn::Join:
+          - ', '
+          - - Fn::Join:
+              - ''
+              - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
+                - ':11211'
+            - Fn::Join:
+              - ', '
+              - Merge::Map:
+                  SwiftStorage0:
+                    Fn::Join:
+                    - ''
+                    - - Fn::Select:
+                        - 0
+                        - Fn::Select:
+                          - 'ctlplane'
+                          - Fn::GetAtt:
+                            - SwiftStorage0
+                            - networks
+                      - ':11211'