Add default for DeployIdentifier in nested templates

Until we fix the bug where at validation time heat doesn't know
if a parent passes a value into the nested template, this may
be a workaround for validation failing where no default is found.

Change-Id: I02b0764ac29700cd29584e356ac0cfebcda09a36
Closes-Bug: #1619352

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index a43e964..ab5ee6d 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -26,6 +26,7 @@ parameters:
     type: comma_delimited_list
   DeployIdentifier:
     type: string
+    default: ''
     description: >
       Setting this to a unique value will re-run any deployment tasks which
       perform configuration on a Heat stack-update.

diff --git a/puppet/ceph-storage-post.yaml b/puppet/ceph-storage-post.yaml
index a83e0cf..df6b724 100644 (file)
--- a/puppet/ceph-storage-post.yaml
+++ b/puppet/ceph-storage-post.yaml
@@ -15,6 +15,7 @@ parameters:
     default: {}
   DeployIdentifier:
      type: string
+     default: ''
      description: Value which changes if the node configuration may need to be re-applied
 
 resources:

diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index 6416c43..0620bc6 100644 (file)
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -10,6 +10,7 @@ parameters:
     type: json
   DeployIdentifier:
      type: string
+     default: ''
      description: Value which changes if the node configuration may need to be re-applied
   RoleData:
     type: json

diff --git a/puppet/compute-post.yaml b/puppet/compute-post.yaml
index d0c6082..358ec5a 100644 (file)
--- a/puppet/compute-post.yaml
+++ b/puppet/compute-post.yaml
@@ -15,6 +15,7 @@ parameters:
     default: {}
   DeployIdentifier:
      type: string
+     default: ''
      description: Value which changes if the node configuration may need to be re-applied
 
 resources:

diff --git a/puppet/controller-post.yaml b/puppet/controller-post.yaml
index 4af6cb4..c97c3bc 100644 (file)
--- a/puppet/controller-post.yaml
+++ b/puppet/controller-post.yaml
@@ -15,6 +15,7 @@ parameters:
     default: {}
   DeployIdentifier:
      type: string
+     default: ''
      description: Value which changes if the node configuration may need to be re-applied
 
 resources:

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index 859fad2..ebc54ab 100644 (file)
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -13,6 +13,7 @@ parameters:
     default: {}
   DeployIdentifier:
      type: string
+     default: ''
      description: Value which changes if the node configuration may need to be re-applied
 
 resources: