Move to software-config for the undercloud.

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

diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index 92e11e6..f20b275 100644 (file)
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -11,31 +11,10 @@ Parameters:
   NeutronNetworkType:
     Type: String
     Default: 'gre'
+  NeutronEnableTunnelling:
+    Type: String
+    Default: True
 Resources:
-  SwiftStorageAccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources:
-      - SwiftStorage0
-      - SwiftStorage0Config
-  SwiftStorageUser:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: SwiftStorageAccessPolicy } ]
-  SwiftStorage0Key:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: SwiftStorageUser
-  SwiftStorage0CompletionCondition:
-    Type: AWS::CloudFormation::WaitCondition
-    DependsOn: notCompute0Config
-    Properties:
-      Handle: {Ref: SwiftStorage0CompletionHandle}
-      Count: '1'
-      Timeout: '1800'
-  SwiftStorage0CompletionHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
   SwiftStorage0:
     Type: OS::Nova::Server
     Properties:
@@ -43,60 +22,20 @@ Resources:
         {Ref: SwiftStorageImage}
       flavor: {Ref: OvercloudSwiftStorageFlavor}
       key_name: {Ref: KeyName}
-    Metadata:
-      os-collect-config:
-        cfn:
-          access_key_id:
-            Ref: SwiftStorage0Key
-          secret_access_key:
-            Fn::GetAtt: [ SwiftStorage0Key, SecretAccessKey ]
-          stack_name: {Ref: 'AWS::StackName'}
-          path: SwiftStorage0Config.Metadata
-      OpenStack::ImageBuilder::Elements: [ swift ]
-  SwiftStorage0Config:
-    Type: AWS::AutoScaling::LaunchConfiguration
+  SwiftStorage0Deploy:
+    Type: OS::Heat::StructuredDeployment
     Properties:
-      InstanceType: '0'
-      ImageId: '0'
-    Metadata:
-      completion-handle:
-        Ref: SwiftStorage0CompletionHandle
-      os-collect-config:
-        cfn:
-          access_key_id:
-            Ref: SwiftStorage0Key
-          secret_access_key:
-            Fn::GetAtt: [ SwiftStorage0Key, SecretAccessKey ]
-          stack_name: {Ref: 'AWS::StackName'}
-          path: SwiftStorage0Config.Metadata
-      admin-password: {Ref: AdminPassword}
-      neutron:
-        ovs:
-          local_ip:
-            Fn::Select:
-              - 0
-              - Fn::Select:
-                - ctlplane
-                - Fn::GetAtt:
-                  - SwiftStorage0
-                  - networks
-          tenant_network_type: {Ref: NeutronNetworkType}
-        service-password:
-          Ref: NeutronPassword
-      swift:
-        devices:
+      server: {Ref: SwiftStorage0}
+      config: {Ref: SwiftConfig}
+      input_values:
+        neutron_local_ip: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [SwiftStorage0, networks]} ]} ] }
+        swift_devices:
           Fn::Join:
           - ', '
           - - Fn::Join:
               - ''
               - - 'r1z1-'
-                - Fn::Select:
-                  - 0
-                  - Fn::Select:
-                    - 'ctlplane'
-                    - Fn::GetAtt:
-                      - notCompute0
-                      - networks
+                - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
                 - ':%PORT%/d1'
             - Fn::Join:
               - ', '
@@ -113,9 +52,24 @@ Resources:
                             - SwiftStorage0
                             - networks
                       - ':%PORT%/d1'
-        hash:
-          Ref: SwiftHashSuffix
-        part-power: 10
-        replicas: 1
-        service-password:
-          Ref: SwiftPassword
+        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'