X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=block-storage.yaml;h=e75e773f8bc039fb26d186e47ccbd3c1d93e581c;hb=cfb9931ce409ce5c7866dffa63be69758b85bdb9;hp=9cc92fe104e4e74a9b9fb7aa8206c47047d4abb8;hpb=7773f25759867a8807be21f9df1e58aaf8328e26;p=apex-tripleo-heat-templates.git

diff --git a/block-storage.yaml b/block-storage.yaml
index 9cc92fe1..e75e773f 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -1,87 +1,52 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Common Block Storage Configuration'
-Parameters:
+heat_template_version: 2013-05-23
+description: 'Common Block Storage Configuration'
+parameters:
   BlockStorageImage:
-    Type: String
-    Default: overcloud-cinder-volume
+    type: string
+    default: overcloud-cinder-volume
   OvercloudBlockStorageFlavor:
-    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:
+    default: baremetal
+    description: Flavor for block storage nodes to request when deploying.
+    type: string
+resources:
   BlockStorage0:
-    Type: OS::Nova::Server
-    Properties:
+    type: OS::Nova::Server
+    properties:
       image:
-        {Ref: BlockStorageImage}
-      flavor: {Ref: OvercloudBlockStorageFlavor}
-      key_name: {Ref: KeyName}
+        {get_param: BlockStorageImage}
+      flavor: {get_param: OvercloudBlockStorageFlavor}
+      key_name: {get_param: KeyName}
+      user_data_format: SOFTWARE_CONFIG
   BlockStorage0Deployment:
-    Type: OS::Heat::StructuredDeployment
-    Properties:
-      server: {Ref: BlockStorage0}
-      config: {Ref: BlockStorageConfig}
+    depends_on: [controller0AllNodesDeployment]
+    type: OS::Heat::StructuredDeployment
+    properties:
+      server: {get_resource: BlockStorage0}
+      config: {get_resource: 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]}]]]}
+        controller_virtual_ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+        cinder_dsn: {"Fn::Join": ['', ['mysql://cinder:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} , '/cinder']]}
+      signal_transport: NO_SIGNAL
   BlockStorageConfig:
-    Type: OS::Heat::StructuredConfig
-    Properties:
+    type: OS::Heat::StructuredConfig
+    properties:
+      group: os-apply-config
       config:
-        admin-password: {Ref: AdminPassword}
+        admin-password: {get_param: AdminPassword}
         keystone:
-          host: {get_input: controller_host}
+          host: {get_input: controller_virtual_ip}
         cinder:
           db: {get_input: cinder_dsn}
           volume_size_mb:
-            Ref: CinderLVMLoopDeviceSize
+            get_param: CinderLVMLoopDeviceSize
           service-password:
-            Ref: CinderPassword
+            get_param: CinderPassword
           iscsi-helper:
-            Ref: CinderISCSIHelper
-        admin-password: {Ref: AdminPassword}
+            get_param: CinderISCSIHelper
         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
+          host: {get_input: controller_virtual_ip}
+          username: {get_param: RabbitUserName}
+          password: {get_param: RabbitPassword}
+        glance:
+          host: {get_input: controller_virtual_ip}
+          port: {get_param: GlancePort}