From 02772ba2877b9f6d427c6fd760bf19d6334c68a8 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Fri, 18 Jul 2014 12:55:31 +1200
Subject: Convert Fn::Select to extended get_attr

Overcloud bootstrap_nodeid is now specified by parameter
BootStrapNodeResource with default value controller0.
This avoids the need to use Fn::Select on the mergy.py
built list of controllers to specify the first controller.

Change-Id: Id9cfeab50b90ceeeae51ea0e35997b7495b28cc4
Partial-Blueprint: tripleo-juno-remove-mergepy
---
 swift-deploy.yaml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'swift-deploy.yaml')

diff --git a/swift-deploy.yaml b/swift-deploy.yaml
index 2da242e1..eaa01317 100644
--- a/swift-deploy.yaml
+++ b/swift-deploy.yaml
@@ -28,19 +28,13 @@ resources:
                 list_join:
                 - ''
                 - - 'r1z1-'
-                  - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] }
+                  - {get_attr: [controller0, networks, ctlplane, 0]}
                   - ':%PORT%/d1'
               SwiftStorage0:
                 list_join:
                 - ''
                 - - 'r1z1-'
-                  - Fn::Select:
-                    - 0
-                    - Fn::Select:
-                      - 'ctlplane'
-                      - get_attr:
-                        - SwiftStorage0
-                        - networks
+                  - {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
                   - ':%PORT%/d1'
         swift_proxy_memcache:
           list_join:
@@ -51,5 +45,5 @@ resources:
                     - ', '
                     - - list_join:
                         - ''
-                        - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] }
+                        - - {get_attr: [controller0, networks, ctlplane, 0]}
                           - ':11211'
-- 
cgit 1.2.3-korg