X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcontroller-config.yaml;h=99c7b26e0ac7836317bb79a325f094f4edbe69d9;hb=6e70ca03645f5dee7a538dd32013eb3de1435608;hp=34c68ba7b94fd6d48b99e32a8e764fc5d31af112;hpb=607ea9c8d30d752b01881e2ac913c712f0243272;p=apex-tripleo-heat-templates.git

diff --git a/puppet/controller-config.yaml b/puppet/controller-config.yaml
index 34c68ba7..99c7b26e 100644
--- a/puppet/controller-config.yaml
+++ b/puppet/controller-config.yaml
@@ -1,8 +1,18 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   A software config which runs manifests/overcloud_controller.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,20 @@ 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
+      inputs:
+      - name: step
+        type: Number
       config:
-        get_file: manifests/overcloud_controller.pp
+        list_join:
+        - ''
+        - - get_file: manifests/overcloud_controller.pp
+          - {get_param: StepConfig}
 
 outputs:
   OS::stack_id: