Merge "Add rabbit.cookie attribute"

[apex-tripleo-heat-templates.git] / overcloud-source.yaml

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index fa626aa..42fc07a 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -17,15 +17,27 @@ Parameters:
     Description: The password for the cinder service account, used by cinder-api.
     Type: String
     NoEcho: true
-  Flavor:
+  OvercloudControlFlavor:
     Default: baremetal
-    Description: Flavor to request when deploying.
+    Description: Flavor for control nodes to request when deploying.
+    Type: String
+  OvercloudComputeFlavor:
+    Default: baremetal
+    Description: Flavor for compute nodes to request when deploying.
     Type: String
   GlancePassword:
     Default: unset
     Description: The password for the glance service account, used by the glance services.
     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: ''
   HeatPassword:
     Default: unset
     Description: The password for the Heat service account, used by the Heat services.
@@ -154,7 +166,7 @@ Resources:
     Type: AWS::IAM::AccessKey
   notCompute0CompletionCondition:
     Type: AWS::CloudFormation::WaitCondition
-    DependsOn: notCompute0
+    DependsOn: notCompute0Config
     Properties:
       Handle: {Ref: notCompute0CompletionHandle}
       Count: '1'
@@ -303,6 +315,10 @@ Resources:
         swift-store-user: service:glance
         swift-store-key:
           Ref: GlancePassword
+        notifier-strategy:
+          Ref: GlanceNotifierStrategy
+        log-file:
+          Ref: GlanceLogFile
       heat:
         admin_password:
           Ref: HeatPassword
@@ -460,7 +476,7 @@ Resources:
       image_update_policy:
         Ref: ImageUpdatePolicy
       flavor:
-        Ref: Flavor
+        Ref: OvercloudControlFlavor
       key_name:
         Ref: KeyName
     Metadata: