Add rabbit.cookie attribute

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

diff --git a/block-storage.yaml b/block-storage.yaml
index d7548c9..ca56fce 100644 (file)
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -4,15 +4,9 @@ Parameters:
   BlockStorageImage:
     Type: String
     Default: overcloud-cinder-volume
-  KeystoneHost:
+  RabbitUserName:
     Type: String
-    Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
-  MySQLHost:
-    Type: String
-    Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
-  RabbitHost:
-    Type: String
-    Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
+    Default: "guest"
   RabbitPassword:
     Type: String
     Default: "guest"
@@ -39,8 +33,6 @@ Resources:
         {Ref: BlockStorageImage}
       flavor: {Ref: Flavor}
       key_name: {Ref: KeyName}
-      InstanceType: '0'
-      ImageId: '0'
     Metadata:
       os-collect-config:
         cfn:
@@ -51,16 +43,17 @@ Resources:
           stack_name: {Ref: 'AWS::StackName'}
       OpenStack::ImageBuilder::Elements: [ cinder ]
       keystone:
-        host: {Ref: KeystoneHost}
+        host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
       cinder:
-        db: {"Fn::Join": ['', ['mysql://cinder:unset@', {Ref: MySQLHost}, '/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
         volume: 'true'
       admin-password: {Ref: AdminPassword}
       rabbit:
-        host: {Ref: RabbitHost}
+        host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
+        username: {Ref: RabbitUserName}
         password: {Ref: RabbitPassword}
       interfaces:
-        control: {Ref: NeutronPublicInterface}
\ No newline at end of file
+        control: {Ref: NeutronPublicInterface}