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
---
 examples/scale_result_hot.yaml | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'examples/scale_result_hot.yaml')

diff --git a/examples/scale_result_hot.yaml b/examples/scale_result_hot.yaml
index c9f865a5..a1b27095 100644
--- a/examples/scale_result_hot.yaml
+++ b/examples/scale_result_hot.yaml
@@ -42,13 +42,11 @@ resources:
       neutron:
         ovs:
           local_ip:
-            Fn::Select:
+            get_attr:
+            - NovaCompute0
+            - networks
+            - ctlplane
             - 0
-            - Fn::Select:
-              - ctlplane
-              - get_attr:
-                - NovaCompute0
-                - networks
       os-collect-config:
         cfn:
           access_key_id:
@@ -103,13 +101,11 @@ resources:
       neutron:
         ovs:
           local_ip:
-            Fn::Select:
+            get_attr:
+            - NovaCompute1
+            - networks
+            - ctlplane
             - 0
-            - Fn::Select:
-              - ctlplane
-              - get_attr:
-                - NovaCompute1
-                - networks
       os-collect-config:
         cfn:
           access_key_id:
@@ -164,13 +160,11 @@ resources:
       neutron:
         ovs:
           local_ip:
-            Fn::Select:
+            get_attr:
+            - NovaCompute2
+            - networks
+            - ctlplane
             - 0
-            - Fn::Select:
-              - ctlplane
-              - get_attr:
-                - NovaCompute2
-                - networks
       os-collect-config:
         cfn:
           access_key_id:
-- 
cgit 1.2.3-korg