From 02772ba2877b9f6d427c6fd760bf19d6334c68a8 Mon Sep 17 00:00:00 2001 From: Steve Baker 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 --- block-storage.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'block-storage.yaml') diff --git a/block-storage.yaml b/block-storage.yaml index 98f62c44..3e5f460b 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -29,9 +29,9 @@ resources: server: {get_resource: BlockStorage0} config: {get_resource: BlockStorageConfig} input_values: - controller_host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] } - cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] } , '/cinder']]} - neutron_local_ip: {"Fn::Select": [0, "Fn::Select": [ctlplane, {get_attr: [BlockStorage0 , networks]}]]} + controller_host: {get_attr: [controller0, networks, ctlplane, 0]} + cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_attr: [controller0, networks, ctlplane, 0]} , '/cinder']]} + neutron_local_ip: {get_attr: [BlockStorage0 , networks, ctlplane, 0]} signal_transport: NO_SIGNAL BlockStorageConfig: type: OS::Heat::StructuredConfig -- cgit 1.2.3-korg