aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/swift-storage-post.yaml
diff options
context:
space:
mode:
authorSteve Baker <sbaker@redhat.com>2015-12-10 14:48:04 +1300
committerSteve Baker <sbaker@redhat.com>2015-12-10 14:48:04 +1300
commit1733d74392b0cc8f3577da68fbb5eb6165802c37 (patch)
tree65f62c228f6e137831353ba84d88e9277bd364d4 /puppet/swift-storage-post.yaml
parent2674efae84f6ba808fbaa5f0150825e42a86ba59 (diff)
Set the name property for all deployment resources
There are two reasons the name property should always be set for deployment resources: - The name often shows up in logs, files and API calls, the default derived name is long and unhelpful - Sorting by name determines the merge order of os-apply-config, and the execution order of puppet/shell scripts (note this is different to resource dependency order) so leaving the default name results in an undetermined order which could lead to unpredictable deployment of configs This change simply sets the name to the resource name, but a future change should prepend each name with a run-parts style 2 digit prefix so that the order is explicitly stated. Documentation for extraconfig needs to clearly state what prefix is needed to override which merge/execution order. For existing overcloud stacks, heat currently replaces deployment resources when the name changes, so this change Depends-On: I95037191915ccd32b2efb72203b146897a4edbc9 Change-Id: Ic4bcd56aa65b981275c3d4214588bfc4de63b3b0
Diffstat (limited to 'puppet/swift-storage-post.yaml')
-rw-r--r--puppet/swift-storage-post.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index d22f538..a55b395 100644
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -29,6 +29,7 @@ resources:
StorageDeployment_Step1:
type: OS::Heat::StructuredDeployments
properties:
+ name: StorageDeployment_Step1
servers: {get_param: servers}
config: {get_resource: StoragePuppetConfig}
input_values:
@@ -49,6 +50,7 @@ resources:
type: OS::Heat::StructuredDeployments
depends_on: StorageDeployment_Step1
properties:
+ name: StorageRingbuilderDeployment_Step2
servers: {get_param: servers}
config: {get_resource: StorageRingbuilderPuppetConfig}
input_values: