Merge "Merge Block Storage into Overcloud"

[apex-tripleo-heat-templates.git] / notcompute.yaml

diff --git a/notcompute.yaml b/notcompute.yaml
index ef33936..2ad5b30 100644 (file)
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -31,6 +31,14 @@ Parameters:
     Description: Password for connecting to glance database
     Type: String
     NoEcho: true
+  GlanceNotifierStrategy:
+    Description: Strategy to use for Glance notification queue
+    Type: String
+    Default: noop
+  GlanceLogFile:
+    Description: The filepath of the file to use for logging messages from Glance.
+    Type: String
+    Default: ''
   HeatDBPassword:
     Description: Password for accessing Heat database.
     Type: String
@@ -65,6 +73,8 @@ Parameters:
     Description: Password for RabbitMQ
     Type: String
     NoEcho: true
+  RabbitUserName:
+    Type: String
   RabbitPassword:
     Type: String
     NoEcho: true
@@ -78,9 +88,9 @@ Resources:
   AccessPolicy:
     Properties:
       AllowedResources:
-      - notcompute
+      - notCompute0
     Type: OS::Heat::AccessPolicy
-  Key:
+  notCompute0Key:
     Properties:
       UserName:
         Ref: User
@@ -90,7 +100,7 @@ Resources:
       Policies:
       - Ref: AccessPolicy
     Type: AWS::IAM::User
-  notcompute:
+  notCompute0:
     Metadata:
       OpenStack::ImageBuilder::Elements:
       - nova-api
@@ -128,6 +138,10 @@ Resources:
             - - 'mysql://glance:'
               - {Ref: GlanceDBPassword}
               - '@127.0.0.1/glance'
+          notifier-strategy:
+            Ref: GlanceNotifierStrategy
+          log-file:
+            Ref: GlanceLogFile
       heat:
         db:
           Fn::Join:
@@ -136,12 +150,12 @@ Resources:
               - {Ref: HeatDBPassword}
               - '@127.0.0.1/heat'
         access_key_id:
-          Ref: Key
+          Ref: notCompute0Key
         refresh:
-        - resource: notcompute
+        - resource: notCompute0
         secret_key:
           Fn::GetAtt:
-          - Key
+          - notCompute0Key
           - SecretAccessKey
         stack:
           name:
@@ -180,12 +194,19 @@ Resources:
       rabbit:
         host:
           '127.0.0.1'
+        username:
+          Ref: RabbitUserName
         password:
           Ref: RabbitPassword
         users:
-          username: guest
+          username:
+            Ref: RabbitUserName
           password:
             Ref: RabbitPassword
+        cookie:
+          Fn::GetAtt:
+          - RabbitCookie
+          - value
       service-password:
         Ref: ServicePassword
     Properties: