From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 14 Aug 2014 15:50:22 +0000 (+0000)
Subject: Merge "Add BlockStorage and SwiftStorage nodes into hosts"
X-Git-Tag: opnfv-6.0.0~2771
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7b24092d44dd830f593a38da3433c78e2373cfc8;p=apex-tripleo-heat-templates.git

Merge "Add BlockStorage and SwiftStorage nodes into hosts"
---

7b24092d44dd830f593a38da3433c78e2373cfc8
diff --cc overcloud-source.yaml
index 6432baa4,467def4c..8eab2f58
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@@ -737,7 -665,31 +737,31 @@@ resources
                          - '.'
                          - - {get_attr: [NovaCompute0, show, name]}
                            - 'novalocal'
 -            - list_join:
 +            - Fn::Join:
+               - "\n"
+               - Merge::Map:
+                   BlockStorage0:
+                     list_join:
+                     - ' '
+                     - - {get_attr: [BlockStorage0, networks, ctlplane, 0]}
+                       - {get_attr: [BlockStorage0, show, name]}
+                       - list_join:
+                         - '.'
+                         - - {get_attr: [BlockStorage0, show, name]}
+                           - 'novalocal'
+             - list_join:
+               - "\n"
+               - Merge::Map:
+                   SwiftStorage0:
+                     list_join:
+                     - ' '
+                     - - {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
+                       - {get_attr: [SwiftStorage0, show, name]}
+                       - list_join:
+                         - '.'
+                         - - {get_attr: [SwiftStorage0, show, name]}
+                           - 'novalocal'
+             - list_join:
                - "\n"
                - Merge::Map:
                    controller0: