diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-05 12:50:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-05 12:50:48 +0000 |
| commit | 578c4f9e468266b284d72d07a053aafd79678dd8 (patch) | |
| tree | 144d0b2f148ac89b6d078d14b679614f10ab6277 | |
| parent | b8f154be31c5847dc376a72cf9c0835aa0001afd (diff) | |
| parent | 9579bbff107514f4a02fa014c8975f6fbac5ed3e (diff) | |
Merge "Add default for DeployIdentifier in nested templates"
| -rw-r--r-- | puppet/all-nodes-config.yaml | 1 | ||||
| -rw-r--r-- | puppet/ceph-storage-post.yaml | 1 | ||||
| -rw-r--r-- | puppet/cinder-storage-post.yaml | 1 | ||||
| -rw-r--r-- | puppet/compute-post.yaml | 1 | ||||
| -rw-r--r-- | puppet/controller-post.yaml | 1 | ||||
| -rw-r--r-- | puppet/swift-storage-post.yaml | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 3b966985..bc9a2720 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -24,6 +24,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 a83e0cfe..df6b7249 100644 --- 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 6416c43e..0620bc6c 100644 --- 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 d0c6082c..358ec5a8 100644 --- 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 4af6cb46..c97c3bc8 100644 --- 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 859fad2c..ebc54ab0 100644 --- 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: |