From 337d2c62038bde10cfb48d6c1bd09f3cbf72ba6a Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 22 Jun 2016 13:13:34 -0400
Subject: Pass RoleData into -post.yaml stacks

This patch modifies the interface for the -post stacks so
that we pass RoleData instead of just the StepConfig
into each -post.yaml template.

This will facilitate creating other types of -post.yaml scripts
that require more data that just 'step_config'. Things like
containers, etc. will require this.

Change-Id: I2527fc0098192f092f5e9046033a04bc71be2cae
---
 puppet/ceph-storage-post.yaml   | 13 ++++++-------
 puppet/cinder-storage-post.yaml |  9 ++++-----
 puppet/compute-post.yaml        | 13 ++++++-------
 puppet/controller-post.yaml     | 13 ++++++-------
 puppet/swift-storage-post.yaml  | 13 ++++++-------
 5 files changed, 28 insertions(+), 33 deletions(-)

(limited to 'puppet')

diff --git a/puppet/ceph-storage-post.yaml b/puppet/ceph-storage-post.yaml
index 2b9ae751..edeb2d93 100644
--- a/puppet/ceph-storage-post.yaml
+++ b/puppet/ceph-storage-post.yaml
@@ -11,12 +11,11 @@ parameters:
   servers:
     type: json
   NodeConfigIdentifiers:
-     type: json
-     description: Value which changes if the node configuration may need to be re-applied
-  StepConfig:
-    type: string
-    description: Config manifests that will be used to step through the deployment.
-    default: ''
+    type: json
+    description: Value which changes if the node configuration may need to be re-applied
+  RoleData:
+    type: json
+    default: {}
 
 resources:
 
@@ -47,7 +46,7 @@ resources:
         list_join:
         - ''
         - - get_file: manifests/overcloud_cephstorage.pp
-          - {get_param: StepConfig}
+          - {get_param: [RoleData, step_config]}
 
   CephStorageDeployment_Step2:
     type: OS::Heat::StructuredDeployments
diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index fa1516f1..4de141f2 100644
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -11,10 +11,9 @@ parameters:
   NodeConfigIdentifiers:
      type: json
      description: Value which changes if the node configuration may need to be re-applied
-  StepConfig:
-    type: string
-    description: Config manifests that will be used to step through the deployment.
-    default: ''
+  RoleData:
+    type: json
+    default: {}
 
 resources:
 
@@ -46,7 +45,7 @@ resources:
         list_join:
         - ''
         - - get_file: manifests/overcloud_volume.pp
-          - {get_param: StepConfig}
+          - {get_param: [RoleData, step_config]}
 
   VolumeDeployment_Step2:
     type: OS::Heat::StructuredDeployments
diff --git a/puppet/compute-post.yaml b/puppet/compute-post.yaml
index 698cadba..2033c4b4 100644
--- a/puppet/compute-post.yaml
+++ b/puppet/compute-post.yaml
@@ -11,12 +11,11 @@ parameters:
   servers:
     type: json
   NodeConfigIdentifiers:
-     type: json
-     description: Value which changes if the node configuration may need to be re-applied
-  StepConfig:
-     type: string
-     description: Config manifests that will be used to step through the deployment.
-     default: ''
+    type: json
+    description: Value which changes if the node configuration may need to be re-applied
+  RoleData:
+    type: json
+    default: {}
 
 resources:
 
@@ -47,7 +46,7 @@ resources:
         list_join:
         - ''
         - - get_file: manifests/overcloud_compute.pp
-          - {get_param: StepConfig}
+          - {get_param: [RoleData, step_config]}
 
   ComputeServicesBaseDeployment_Step2:
     type: OS::Heat::StructuredDeployments
diff --git a/puppet/controller-post.yaml b/puppet/controller-post.yaml
index 36f9b4f8..27fbdec0 100644
--- a/puppet/controller-post.yaml
+++ b/puppet/controller-post.yaml
@@ -11,12 +11,11 @@ parameters:
   servers:
     type: json
   NodeConfigIdentifiers:
-     type: json
-     description: Value which changes if the node configuration may need to be re-applied
-  StepConfig:
-     type: string
-     description: Config manifests that will be used to step through the deployment.
-     default: ''
+    type: json
+    description: Value which changes if the node configuration may need to be re-applied
+  RoleData:
+    type: json
+    default: {}
 
 resources:
 
@@ -39,7 +38,7 @@ resources:
   ControllerPuppetConfig:
     type: OS::TripleO::ControllerConfig
     properties:
-      StepConfig: {get_param: StepConfig}
+      StepConfig: {get_param: [RoleData, step_config]}
 
   # Step through a series of Puppet runs using the same manifest.
   # NOTE: To enable stepping through the deployments via heat hooks,
diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index 1aba2bb4..b873d923 100644
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -9,12 +9,11 @@ parameters:
   servers:
     type: json
   NodeConfigIdentifiers:
-     type: json
-     description: Value which changes if the node configuration may need to be re-applied
-  StepConfig:
-     type: string
-     description: Config manifests that will be used to step through the deployment.
-     default: ''
+    type: json
+    description: Value which changes if the node configuration may need to be re-applied
+  RoleData:
+    type: json
+    default: {}
 
 resources:
 
@@ -46,7 +45,7 @@ resources:
         - ''
         - - get_file: manifests/overcloud_object.pp
           - get_file: manifests/ringbuilder.pp
-          - {get_param: StepConfig}
+          - {get_param: [RoleData, step_config]}
 
   StorageRingbuilderDeployment_Step2:
     type: OS::Heat::StructuredDeployments
-- 
cgit 1.2.3-korg