summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-24 21:17:36 +0000
committerGerrit Code Review <review@openstack.org>2015-02-24 21:17:36 +0000
commit758c6f1597796d9ad0d2cf5758f2d1a30e912475 (patch)
tree2870c43e79d24dc668f3619c41bd72cd70128194
parent648b62d898bcc87d50c3f510e6706cf37499b2e3 (diff)
parent410707efe8e0785fa7420078ebe540426e3f6588 (diff)
Merge "Add allNodesConfig to Swift storage nodes"
-rw-r--r--overcloud-without-mergepy.yaml8
1 files changed, 7 insertions, 1 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index cea55b23..8532081b 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -783,6 +783,12 @@ resources:
config: {get_attr: [allNodesConfig, config_id]}
servers: {get_attr: [BlockStorage, attributes, nova_server_resource]}
+ ObjectStorageAllNodesDeployment:
+ type: OS::Heat::StructuredDeployments
+ properties:
+ config: {get_attr: [allNodesConfig, config_id]}
+ servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]}
+
# Nested stack deployment runs after all other controller deployments
ControllerNodesPostDeployment:
type: OS::TripleO::ControllerPostDeployment
@@ -798,7 +804,7 @@ resources:
ObjectStorageNodesPostDeployment:
type: OS::TripleO::ObjectStoragePostDeployment
- depends_on: ObjectStorageSwiftDeployment
+ depends_on: [ObjectStorageSwiftDeployment, ObjectStorageAllNodesDeployment]
properties:
servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]}