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 /block-storage.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 'block-storage.yaml')
| -rw-r--r-- | block-storage.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
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 |