Merge "Add default for DeployIdentifier in nested templates"

[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 38161cd..b313f5d 100644 (file)
--- a/puppet/controller-config-pacemaker.yaml
+++ b/puppet/controller-config-pacemaker.yaml
@@ -3,6 +3,16 @@ heat_template_version: 2015-04-30
 description: >
   A software config which runs manifests/overcloud_controller_pacemaker.pp
 
+parameters:
+  ConfigDebug:
+    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:
 
   ControllerPuppetConfigImpl:
@@ -10,12 +20,17 @@ resources:
     properties:
       group: puppet
       options:
+        enable_debug: {get_param: ConfigDebug}
         enable_hiera: True
         enable_facter: False
+        modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
       outputs:
       - name: result
       config:
-        get_file: manifests/overcloud_controller_pacemaker.pp
+        list_join:
+        - ''
+        - - get_file: manifests/overcloud_controller_pacemaker.pp
+          - {get_param: StepConfig}
 
 outputs:
   OS::stack_id: