X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=block-storage.yaml;h=9cc92fe104e4e74a9b9fb7aa8206c47047d4abb8;hb=716b190be8843f46b5c3023298d3f31672854057;hp=fb6261ce041cfe8d8b82f9f80996b48c4f6a39ce;hpb=2f50006b5bdf0d2f84f806e9d9c7f0dc5ab656e6;p=apex-tripleo-heat-templates.git

diff --git a/block-storage.yaml b/block-storage.yaml
index fb6261ce..9cc92fe1 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -8,30 +8,13 @@ Parameters:
     Default: baremetal
     Description: Flavor for block storage nodes to request when deploying.
     Type: String
+  NeutronNetworkType:
+    Type: String
+    Default: 'gre'
+  NeutronEnableTunnelling:
+    Type: String
+    Default: True
 Resources:
-  BlockStorageAccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources:
-      - BlockStorage0
-  BlockStorageUser:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: BlockStorageAccessPolicy } ]
-  BlockStorageKey:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: BlockStorageUser
-  BlockStorage0CompletionCondition:
-    Type: AWS::CloudFormation::WaitCondition
-    DependsOn: notCompute0Config
-    Properties:
-      Handle: {Ref: BlockStorage0CompletionHandle}
-      Count: '1'
-      Timeout: '1800'
-  BlockStorage0CompletionHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
   BlockStorage0:
     Type: OS::Nova::Server
     Properties:
@@ -39,30 +22,66 @@ Resources:
         {Ref: BlockStorageImage}
       flavor: {Ref: OvercloudBlockStorageFlavor}
       key_name: {Ref: KeyName}
-    Metadata:
-      completion-handle:
-        Ref: BlockStorage0CompletionHandle
-      os-collect-config:
-        cfn:
-          access_key_id:
-            Ref: BlockStorageKey
-          secret_access_key:
-            Fn::GetAtt: [ BlockStorageKey, SecretAccessKey ]
-          stack_name: {Ref: 'AWS::StackName'}
-      OpenStack::ImageBuilder::Elements: [ cinder ]
-      keystone:
-        host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
-      cinder:
-        db: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } , '/cinder']]}
-        volume_size_mb: '5000'
-        service-password:
-          Ref: CinderPassword
-        iscsi-helper:
-          Ref: CinderISCSIHelper
-      admin-password: {Ref: AdminPassword}
-      rabbit:
-        host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
-        username: {Ref: RabbitUserName}
-        password: {Ref: RabbitPassword}
-      interfaces:
-        control: {Ref: NeutronPublicInterface}
+  BlockStorage0Deployment:
+    Type: OS::Heat::StructuredDeployment
+    Properties:
+      server: {Ref: BlockStorage0}
+      config: {Ref: BlockStorageConfig}
+      input_values:
+        controller_host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] }
+        cinder_dsn: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } , '/cinder']]}
+        neutron_local_ip: {"Fn::Select": [0, "Fn::Select": [ctlplane, [{"Fn::GetAtt": [BlockStorage0 , networks]}]]]}
+  BlockStorageConfig:
+    Type: OS::Heat::StructuredConfig
+    Properties:
+      config:
+        admin-password: {Ref: AdminPassword}
+        keystone:
+          host: {get_input: controller_host}
+        cinder:
+          db: {get_input: cinder_dsn}
+          volume_size_mb:
+            Ref: CinderLVMLoopDeviceSize
+          service-password:
+            Ref: CinderPassword
+          iscsi-helper:
+            Ref: CinderISCSIHelper
+        admin-password: {Ref: AdminPassword}
+        rabbit:
+          host: {get_input: controller_host}
+          username: {Ref: RabbitUserName}
+          password: {Ref: RabbitPassword}
+        interfaces:
+          control: {Ref: NeutronPublicInterface}
+        neutron:
+          ovs:
+            local_ip: {get_input: neutron_local_ip}
+            tenant_network_type: {Ref: NeutronNetworkType}
+            enable_tunneling: {Ref: NeutronEnableTunnelling}
+          service-password:
+            Ref: NeutronPassword
+        config:
+          keystone:
+            host: {get_input: controller_host}
+          cinder:
+            db: {get_input: cinder_dsn}
+            volume_size_mb:
+              Ref: CinderLVMLoopDeviceSize
+            service-password:
+              Ref: CinderPassword
+            iscsi-helper:
+              Ref: CinderISCSIHelper
+          admin-password: {Ref: AdminPassword}
+          rabbit:
+            host: {get_input: controller_host}
+            username: {Ref: RabbitUserName}
+            password: {Ref: RabbitPassword}
+          interfaces:
+            control: {Ref: NeutronPublicInterface}
+          neutron:
+            ovs:
+              local_ip: { get_input: neutron_local_ip }
+              tenant_network_type: {Ref: NeutronNetworkType}
+              enable_tunneling: {Ref: NeutronEnableTunnelling}
+            service-password:
+              Ref: NeutronPassword