X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcompute-post.yaml;h=358ec5a8637ac4f0aafd0a5b5b914b1200dd7b56;hb=1be640af938fc5685352a94124c287ad4a3fabb9;hp=2033c4b433aa82327bf4360ad60430fcbd7b6f80;hpb=337d2c62038bde10cfb48d6c1bd09f3cbf72ba6a;p=apex-tripleo-heat-templates.git

diff --git a/puppet/compute-post.yaml b/puppet/compute-post.yaml
index 2033c4b4..358ec5a8 100644
--- a/puppet/compute-post.yaml
+++ b/puppet/compute-post.yaml
@@ -10,12 +10,13 @@ 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
+     default: ''
+     description: Value which changes if the node configuration may need to be re-applied
 
 resources:
 
@@ -28,7 +29,7 @@ resources:
       servers:  {get_param: servers}
       config: {get_resource: ComputeArtifactsConfig}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ComputePuppetConfig:
     type: OS::Heat::SoftwareConfig
@@ -38,6 +39,7 @@ resources:
         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
       outputs:
@@ -57,7 +59,7 @@ resources:
       config: {get_resource: ComputePuppetConfig}
       input_values:
         step: 2
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ComputeOvercloudServicesDeployment_Step3:
     type: OS::Heat::StructuredDeployments
@@ -68,7 +70,7 @@ resources:
       config: {get_resource: ComputePuppetConfig}
       input_values:
         step: 3
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ComputeOvercloudServicesDeployment_Step4:
     type: OS::Heat::StructuredDeployments
@@ -79,7 +81,7 @@ resources:
       config: {get_resource: ComputePuppetConfig}
       input_values:
         step: 4
-        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.