Include redis/mongo hiera when using pacemaker

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

diff --git a/puppet/objectstorage-config.yaml b/puppet/objectstorage-config.yaml
index 1dee8e6..76bffdd 100644 (file)
--- a/puppet/objectstorage-config.yaml
+++ b/puppet/objectstorage-config.yaml
@@ -1,7 +1,7 @@
 heat_template_version: 2015-04-30
 
 description: >
-  A software config which runs manifests/overcloud_object.pp
+  A software config which applies puppet on the objectstorage role
 
 parameters:
   ConfigDebug:
@@ -24,15 +24,21 @@ resources:
         enable_hiera: True
         enable_facter: False
         modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
+      inputs:
+      - name: step
+        type: Number
       outputs:
       - name: result
       config:
         list_join:
         - ''
-        - - get_file: manifests/overcloud_object.pp
+        - - str_replace:
+              template: {get_file: manifests/overcloud_role.pp}
+              params:
+                __ROLE__: objectstorage
           - {get_param: StepConfig}
 
 outputs:
   OS::stack_id:
-    description: The software config which runs overcloud_controller.pp
+    description: The software config which applies puppet on the objectstorage role
     value: {get_resource: ObjectStoragePuppetConfigImpl}