diff options
| author |   Steve Baker <sbaker@redhat.com> | 2014-07-18 12:55:31 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2014-08-04 08:57:52 +1200 |
| commit | 02772ba2877b9f6d427c6fd760bf19d6334c68a8 (patch) | |
| tree | 7245a75828129f9eba3812e6053afe5af6ffdf68 /examples | |
| parent | beca15dec5265783047d5df210b270ed3d77dd4b (diff) | |
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
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/scale2_hot.yaml | 9 | ||||
| -rw-r--r-- | examples/scale_map_hot.yaml | 20 | ||||
| -rw-r--r-- | examples/scale_map_result_hot.yaml | 216 | ||||
| -rw-r--r-- | examples/scale_result_hot.yaml | 30 |
4 files changed, 106 insertions, 169 deletions
diff --git a/examples/scale2_hot.yaml b/examples/scale2_hot.yaml index 0f3989cb..eb507616 100644 --- a/examples/scale2_hot.yaml +++ b/examples/scale2_hot.yaml @@ -55,14 +55,7 @@ resources: path: NovaCompute0Config.Metadata neutron: ovs: - local_ip: - Fn::Select: - - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute0 - - networks + local_ip: {get_attr: [NovaCompute0, networks, ctlplane, 0]} rabbit: username: {get_param: RabbitUserName} password: {get_param: RabbitPassword} diff --git a/examples/scale_map_hot.yaml b/examples/scale_map_hot.yaml index 24c14dcc..4a6d6843 100644 --- a/examples/scale_map_hot.yaml +++ b/examples/scale_map_hot.yaml @@ -30,25 +30,11 @@ resources: NovaCompute0: list_join: - ' ' - - - Fn::Select: - - 0 - - Fn::Select: - - ctlplane - - get_attr: - - NovaCompute0 - - networks - - Fn::Select: - - name - - get_attr: - - NovaCompute0 - - show + - - {get_attr: [NovaCompute0, networks, ctlplane, 0]} + - {get_attr: [NovaCompute0, show, name]} - list_join: - '.' - - - Fn::Select: - - name - - get_attr: - - NovaCompute0 - - show + - - {get_attr: [NovaCompute0, show, name]} - 'local' NovaCompute0: type: FileInclude 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: 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: |