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 /swift-deploy.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 'swift-deploy.yaml')
| -rw-r--r-- | swift-deploy.yaml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/swift-deploy.yaml b/swift-deploy.yaml index 2da242e1..eaa01317 100644 --- a/swift-deploy.yaml +++ b/swift-deploy.yaml @@ -28,19 +28,13 @@ resources: list_join: - '' - - 'r1z1-' - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] } + - {get_attr: [controller0, networks, ctlplane, 0]} - ':%PORT%/d1' SwiftStorage0: list_join: - '' - - 'r1z1-' - - Fn::Select: - - 0 - - Fn::Select: - - 'ctlplane' - - get_attr: - - SwiftStorage0 - - networks + - {get_attr: [SwiftStorage0, networks, ctlplane, 0]} - ':%PORT%/d1' swift_proxy_memcache: list_join: @@ -51,5 +45,5 @@ resources: - ', ' - - list_join: - '' - - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {get_attr: [controller0, networks]} ]} ] } + - - {get_attr: [controller0, networks, ctlplane, 0]} - ':11211' |