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 --- examples/scale_map_result_hot.yaml | 216 ++++++++++++++++--------------------- 1 file changed, 90 insertions(+), 126 deletions(-) (limited to 'examples/scale_map_result_hot.yaml') diff --git a/examples/scale_map_result_hot.yaml b/examples/scale_map_result_hot.yaml index 69f0f241..4e657238 100644 --- a/examples/scale_map_result_hot.yaml +++ b/examples/scale_map_result_hot.yaml @@ -46,69 +46,57 @@ resources: ' - - list_join: - ' ' - - - Fn::Select: + - - get_attr: + - NovaCompute0 + - networks + - ctlplane - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute0 - - networks - - Fn::Select: + - get_attr: + - NovaCompute0 + - show - name - - get_attr: - - NovaCompute0 - - show - list_join: - . - - - Fn::Select: + - - get_attr: + - NovaCompute0 + - show - name - - get_attr: - - NovaCompute0 - - show - local - list_join: - ' ' - - - Fn::Select: + - - get_attr: + - NovaCompute1 + - networks + - ctlplane - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute1 - - networks - - Fn::Select: + - get_attr: + - NovaCompute1 + - show - name - - get_attr: - - NovaCompute1 - - show - list_join: - . - - - Fn::Select: + - - get_attr: + - NovaCompute1 + - show - name - - get_attr: - - NovaCompute1 - - show - local - list_join: - ' ' - - - Fn::Select: + - - get_attr: + - NovaCompute2 + - networks + - ctlplane - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute2 - - networks - - Fn::Select: + - get_attr: + - NovaCompute2 + - show - name - - get_attr: - - NovaCompute2 - - show - list_join: - . - - - Fn::Select: + - - get_attr: + - NovaCompute2 + - show - name - - get_attr: - - NovaCompute2 - - show - local os-collect-config: cfn: @@ -165,69 +153,57 @@ resources: ' - - list_join: - ' ' - - - Fn::Select: + - - get_attr: + - NovaCompute0 + - networks + - ctlplane - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute0 - - networks - - Fn::Select: + - get_attr: + - NovaCompute0 + - show - name - - get_attr: - - NovaCompute0 - - show - list_join: - . - - - Fn::Select: + - - get_attr: + - NovaCompute0 + - show - name - - get_attr: - - NovaCompute0 - - show - local - list_join: - ' ' - - - Fn::Select: + - - get_attr: + - NovaCompute1 + - networks + - ctlplane - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute1 - - networks - - Fn::Select: + - get_attr: + - NovaCompute1 + - show - name - - get_attr: - - NovaCompute1 - - show - list_join: - . - - - Fn::Select: + - - get_attr: + - NovaCompute1 + - show - name - - get_attr: - - NovaCompute1 - - show - local - list_join: - ' ' - - - Fn::Select: + - - get_attr: + - NovaCompute2 + - networks + - ctlplane - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute2 - - networks - - Fn::Select: + - get_attr: + - NovaCompute2 + - show - name - - get_attr: - - NovaCompute2 - - show - list_join: - . - - - Fn::Select: + - - get_attr: + - NovaCompute2 + - show - name - - get_attr: - - NovaCompute2 - - show - local os-collect-config: cfn: @@ -284,69 +260,57 @@ resources: ' - - list_join: - ' ' - - - Fn::Select: + - - get_attr: + - NovaCompute0 + - networks + - ctlplane - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute0 - - networks - - Fn::Select: + - get_attr: + - NovaCompute0 + - show - name - - get_attr: - - NovaCompute0 - - show - list_join: - . - - - Fn::Select: + - - get_attr: + - NovaCompute0 + - show - name - - get_attr: - - NovaCompute0 - - show - local - list_join: - ' ' - - - Fn::Select: + - - get_attr: + - NovaCompute1 + - networks + - ctlplane - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute1 - - networks - - Fn::Select: + - get_attr: + - NovaCompute1 + - show - name - - get_attr: - - NovaCompute1 - - show - list_join: - . - - - Fn::Select: + - - get_attr: + - NovaCompute1 + - show - name - - get_attr: - - NovaCompute1 - - show - local - list_join: - ' ' - - - Fn::Select: + - - get_attr: + - NovaCompute2 + - networks + - ctlplane - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute2 - - networks - - Fn::Select: + - get_attr: + - NovaCompute2 + - show - name - - get_attr: - - NovaCompute2 - - show - list_join: - . - - - Fn::Select: + - - get_attr: + - NovaCompute2 + - show - name - - get_attr: - - NovaCompute2 - - show - local os-collect-config: cfn: -- cgit 1.2.3-korg