Merge "Merge Block Storage into Overcloud"

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

diff --git a/notcompute.yaml b/notcompute.yaml
index b097dd0..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
@@ -130,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:
@@ -191,6 +203,10 @@ Resources:
             Ref: RabbitUserName
           password:
             Ref: RabbitPassword
+        cookie:
+          Fn::GetAtt:
+          - RabbitCookie
+          - value
       service-password:
         Ref: ServicePassword
     Properties: