Merge "Revert "Specify cell0 db creation""

[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 dfebcf8..1b71983 100644 (file)
--- a/puppet/controller-config-pacemaker.yaml
+++ b/puppet/controller-config-pacemaker.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: >
   A software config which runs manifests/overcloud_controller_pacemaker.pp
@@ -23,13 +23,16 @@ 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
+      inputs:
+      - name: step
+        type: Number
       config:
         list_join:
         - ''
         - - get_file: manifests/overcloud_controller_pacemaker.pp
-          - get_file: manifests/ringbuilder.pp
           - {get_param: StepConfig}
 
 outputs: