Merge "Remove tenant_id from nova v2.1 endpoint"

[apex-tripleo-heat-templates.git] / puppet / controller-config-pacemaker.yaml

diff --git a/puppet/controller-config-pacemaker.yaml b/puppet/controller-config-pacemaker.yaml
index dc81498..dfebcf8 100644 (file)
--- a/puppet/controller-config-pacemaker.yaml
+++ b/puppet/controller-config-pacemaker.yaml
@@ -8,6 +8,10 @@ parameters:
     default: false
     description: Whether to run config management (e.g. Puppet) in debug mode.
     type: boolean
+  StepConfig:
+     type: string
+     description: Config manifests that will be used to step through the deployment.
+     default: ''
 
 resources:
 
@@ -22,7 +26,11 @@ resources:
       outputs:
       - name: result
       config:
-        get_file: manifests/overcloud_controller_pacemaker.pp
+        list_join:
+        - ''
+        - - get_file: manifests/overcloud_controller_pacemaker.pp
+          - get_file: manifests/ringbuilder.pp
+          - {get_param: StepConfig}
 
 outputs:
   OS::stack_id: