Merge "Add default for DeployIdentifier in nested templates"

[apex-tripleo-heat-templates.git] / puppet / swift-storage-post.yaml

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index b873d92..ebc54ab 100644 (file)
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -8,12 +8,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:
 
@@ -26,7 +27,7 @@ resources:
       servers:  {get_param: servers}
       config: {get_resource: StorageArtifactsConfig}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   StoragePuppetConfig:
     type: OS::Heat::SoftwareConfig
@@ -36,6 +37,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:
@@ -44,7 +46,6 @@ resources:
         list_join:
         - ''
         - - get_file: manifests/overcloud_object.pp
-          - get_file: manifests/ringbuilder.pp
           - {get_param: [RoleData, step_config]}
 
   StorageRingbuilderDeployment_Step2:
@@ -56,7 +57,7 @@ resources:
       config: {get_resource: StoragePuppetConfig}
       input_values:
         step: 2
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   StorageRingbuilderDeployment_Step3:
     type: OS::Heat::StructuredDeployments
@@ -67,7 +68,7 @@ resources:
       config: {get_resource: StoragePuppetConfig}
       input_values:
         step: 3
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   StorageDeployment_Step4:
     type: OS::Heat::StructuredDeployments
@@ -78,7 +79,7 @@ resources:
       config: {get_resource: StoragePuppetConfig}
       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.