Merge "j2 template role config templates"

5 files changed, 7 insertions, 183 deletions

diff --git a/puppet/blockstorage-config.yaml b/puppet/blockstorage-config.yaml
deleted file mode 100644
index 0a052315..00000000
--- a/puppet/blockstorage-config.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: >
-  A software config which applies puppet on the blockstorage 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:
-
-  BlockStoragePuppetConfigImpl:
-    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__: blockstorage
-          - {get_param: StepConfig}
-
-outputs:
-  OS::stack_id:
-    description: The software config which applies puppet on the blockstorage role
-    value: {get_resource: BlockStoragePuppetConfigImpl}
diff --git a/puppet/cephstorage-config.yaml b/puppet/cephstorage-config.yaml
deleted file mode 100644
index 09757ea7..00000000
--- a/puppet/cephstorage-config.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: >
-  A software config which runs applies puppet on the cephstorage 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:
-
-  CephStoragePuppetConfigImpl:
-    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__: cephstorage
-          - {get_param: StepConfig}
-
-outputs:
-  OS::stack_id:
-    description: The software config which applies puppet on the cephstorage role
-    value: {get_resource: CephStoragePuppetConfigImpl}
diff --git a/puppet/compute-config.yaml b/puppet/config.role.j2.yaml
index acc9e61d..e59a0216 100644
--- a/puppet/compute-config.yaml
+++ b/puppet/config.role.j2.yaml
@@ -1,7 +1,7 @@
 heat_template_version: 2015-04-30
 
 description: >
-  A software config which applies puppet on the compute role
+  A software config which runs puppet on the {{role}} role
 
 parameters:
   ConfigDebug:
@@ -15,7 +15,7 @@ parameters:
 
 resources:
 
-  ComputePuppetConfigImpl:
+  {{role}}PuppetConfigImpl:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
@@ -24,21 +24,21 @@ resources:
         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
-      outputs:
-      - name: result
       config:
         list_join:
         - ''
         - - str_replace:
               template: {get_file: manifests/overcloud_role.pp}
               params:
-                __ROLE__: compute
+                __ROLE__: {{role.lower()}}
           - {get_param: StepConfig}
 
 outputs:
   OS::stack_id:
-    description: The software config which applies puppet on the compute role
-    value: {get_resource: ComputePuppetConfigImpl}
+    description: The software config which runs puppet on the {{role}} role
+    value: {get_resource: {{role}}PuppetConfigImpl}
diff --git a/puppet/controller-config.yaml b/puppet/controller-config.yaml
deleted file mode 100644
index 39963479..00000000
--- a/puppet/controller-config.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-heat_template_version: 2015-04-30
-
-description: >
-  A software config which runs puppet on the controller 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:
-
-  ControllerPuppetConfigImpl:
-    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
-      outputs:
-      - name: result
-      inputs:
-      - name: step
-        type: Number
-      config:
-        list_join:
-        - ''
-        - - str_replace:
-              template: {get_file: manifests/overcloud_role.pp}
-              params:
-                __ROLE__: controller
-          - {get_param: StepConfig}
-
-outputs:
-  OS::stack_id:
-    description: The software config which runs puppet on the controller role
-    value: {get_resource: ControllerPuppetConfigImpl}
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}