From: Dan Prince <dprince@redhat.com>
Date: Mon, 23 Feb 2015 19:06:54 +0000 (-0500)
Subject: Add allNodesConfig to Swift storage nodes
X-Git-Tag: opnfv-6.0.0~2657^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=410707efe8e0785fa7420078ebe540426e3f6588;p=apex-tripleo-heat-templates.git

Add allNodesConfig to Swift storage nodes

This patch applies the allNodesConfig data to swift storage
nodes. This contains hosts information which could be useful.

Change-Id: Iaccfdc698e371d6618d561c33f256ccc3c166fb7
---

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]}