Merge "j2 template role config templates"

1 files changed, 0 insertions, 44 deletions

diff --git a/puppet/objectstorage-config.yaml b/puppet/objectstorage-config.yaml
deleted file mode 100644
index 76bffdd1..00000000
--- a/puppet/objectstorage-config.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: >
-  A software config which applies puppet on the objectstorage role
-
-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:
-
-  ObjectStoragePuppetConfigImpl:
-    type: OS::Heat::SoftwareConfig
-    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
-      inputs:
-      - name: step
-        type: Number
-      outputs:
-      - name: result
-      config:
-        list_join:
-        - ''
-        - - str_replace:
-              template: {get_file: manifests/overcloud_role.pp}
-              params:
-                __ROLE__: objectstorage
-          - {get_param: StepConfig}
-
-outputs:
-  OS::stack_id:
-    description: The software config which applies puppet on the objectstorage role
-    value: {get_resource: ObjectStoragePuppetConfigImpl}