summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-08 11:25:59 +0000
committerGerrit Code Review <review@openstack.org>2016-01-08 11:25:59 +0000
commit891e5efd25578b2b4bfff56aa04ac8fbebd55239 (patch)
tree188cd8fd967e5968eb22e9adbdf5c5f68d250916
parent30a05ce403c1ec6edef3bd458e21c870920b98e0 (diff)
parent898bcb3c173751553e33426dddee9ad610ed1705 (diff)
Merge "Add ExtraConfig to cinder storage role"
-rw-r--r--puppet/cinder-storage-post.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index c97cfcf9..bb7f94de 100644
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -30,3 +30,11 @@ resources:
properties:
servers: {get_param: servers}
config: {get_resource: VolumePuppetConfig}
+
+ # Note, this should come last, so use depends_on to ensure
+ # this is created after any other resources.
+ ExtraConfig:
+ depends_on: VolumeDeployment_Step1
+ type: OS::TripleO::NodeExtraConfigPost
+ properties:
+ servers: {get_param: servers}