Merge "Add default for DeployIdentifier in nested templates"

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

diff --git a/puppet/controller-config.yaml b/puppet/controller-config.yaml
index f85e1a9..811c544 100644 (file)
--- a/puppet/controller-config.yaml
+++ b/puppet/controller-config.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:
 
@@ -19,10 +23,14 @@ resources:
         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.pp
+        list_join:
+        - ''
+        - - get_file: manifests/overcloud_controller.pp
+          - {get_param: StepConfig}
 
 outputs:
   OS::stack_id: