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
---
 nova-compute-instance.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova-compute-instance.yaml')

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index d8b3a712..597b42b2 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -207,7 +207,7 @@ resources:
         neutron_flat_networks: {get_param: NeutronFlatNetworks}
         neutron_host: {get_param: NeutronHost}
         neutron_dsn: {get_param: NeutronDSN}
-        neutron_local_ip: {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { get_attr: [ NovaCompute0, networks ]}]]}
+        neutron_local_ip: {get_attr: [NovaCompute0, networks, ctlplane, 0]}
         neutron_tenant_network_type: {get_param: NeutronNetworkType}
         neutron_network_vlan_ranges: {get_param: NeutronNetworkVLANRanges}
         neutron_bridge_mappings: {get_param: NeutronBridgeMappings}
-- 
cgit 1.2.3-korg