From 59b6afcd35f9fc136f75b22c0b51bbe8f7005a6a Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Thu, 12 May 2016 14:58:39 +0100
Subject: Replace NodeConfigIdentifiers with DeployIdentifier

We added NodeConfigIdentifiers to trigger config to be re-applied on
update, but then later added DeployIdentifier which forces config to
*always* be applied on update, so we can simplify things by just
referencing the DeployIdentifier directly.

Change-Id: I79212def1936740825b714419dcb4952bc586a39
---
 puppet/controller-post.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'puppet/controller-post.yaml')

diff --git a/puppet/controller-post.yaml b/puppet/controller-post.yaml
index 27fbdec0..4af6cb46 100644
--- a/puppet/controller-post.yaml
+++ b/puppet/controller-post.yaml
@@ -10,12 +10,12 @@ parameters:
     type: boolean
   servers:
     type: json
-  NodeConfigIdentifiers:
-    type: json
-    description: Value which changes if the node configuration may need to be re-applied
   RoleData:
     type: json
     default: {}
+  DeployIdentifier:
+     type: string
+     description: Value which changes if the node configuration may need to be re-applied
 
 resources:
 
@@ -33,7 +33,7 @@ resources:
     properties:
       servers:  {get_param: servers}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerPuppetConfig:
     type: OS::TripleO::ControllerConfig
@@ -53,7 +53,7 @@ resources:
       config: {get_resource: ControllerPuppetConfig}
       input_values:
         step: 1
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerServicesBaseDeployment_Step2:
     type: OS::Heat::StructuredDeployments
@@ -64,7 +64,7 @@ resources:
       config: {get_resource: ControllerPuppetConfig}
       input_values:
         step: 2
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerOvercloudServicesDeployment_Step3:
     type: OS::Heat::StructuredDeployments
@@ -75,7 +75,7 @@ resources:
       config: {get_resource: ControllerPuppetConfig}
       input_values:
         step: 3
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerOvercloudServicesDeployment_Step4:
     type: OS::Heat::StructuredDeployments
@@ -86,7 +86,7 @@ resources:
       config: {get_resource: ControllerPuppetConfig}
       input_values:
         step: 4
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerOvercloudServicesDeployment_Step5:
     type: OS::Heat::StructuredDeployments
@@ -97,7 +97,7 @@ resources:
       config: {get_resource: ControllerPuppetConfig}
       input_values:
         step: 5
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerPostPuppet:
     type: OS::TripleO::Tasks::ControllerPostPuppet
@@ -105,7 +105,7 @@ resources:
     properties:
       servers:  {get_param: servers}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   # Note, this should come last, so use depends_on to ensure
   # this is created after any other resources.
-- 
cgit 1.2.3-korg