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 /undercloud-source.yaml | |
| 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 'undercloud-source.yaml')
| -rw-r--r-- | undercloud-source.yaml | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/undercloud-source.yaml b/undercloud-source.yaml index e39eb5ee..be743ce3 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -198,18 +198,7 @@ resources: admin-token: get_param: AdminToken bootstrap_host: - bootstrap_nodeid: - Fn::Select: - - 0 - - Fn::Select: - - 0 - - Merge::Map: - undercloud: - - Fn::Select: - - name - - get_attr: - - undercloud - - show + bootstrap_nodeid: {get_attr: [undercloud, show, name]} nodeid: {get_input: bootstack_nodeid} bootstack: public_interface_ip: @@ -315,36 +304,33 @@ resources: server: {get_resource: undercloud} input_values: bootstack_nodeid: - Fn::Select: - - name - - get_attr: - - undercloud - - show + get_attr: + - undercloud + - show + - name controller_host: - Fn::Select: - - 0 - - Fn::Select: - - ctlplane - - get_attr: - - undercloud - - networks + get_attr: + - undercloud + - networks + - ctlplane + - 0 heat.watch_server_url: list_join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { get_attr: [ undercloud, networks ]}]]} + - get_attr: [undercloud, networks, ctlplane, 0] - ':8003' heat.metadata_server_url: list_join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { get_attr: [ undercloud, networks ]}]]} + - {get_attr: [undercloud, networks, ctlplane, 0]} - ':8000' heat.waitcondition_server_url: list_join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { get_attr: [ undercloud, networks ]}]]} + - {get_attr: [undercloud, networks, ctlplane, 0]} - ':8000/v1/waitcondition' 00_undercloudPassthroughDeployment: type: OS::Heat::StructuredDeployment |