diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-01 05:04:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-01 05:04:04 +0000 |
| commit | fdd49d86b904141e9e1cbb2c855c0acd7c7759fb (patch) | |
| tree | 38106fc2995dde711e459544063f3ee53cfc0b92 /swift-deploy.yaml | |
| parent | d1d829e6aceba61532041d8499dc4ffd8055fbc2 (diff) | |
| parent | 82c50c15a8e0fb2e2c397fde6f9b03217482dbfa (diff) | |
Merge "Fix swift memcache and device properties"
Diffstat (limited to 'swift-deploy.yaml')
| -rw-r--r-- | swift-deploy.yaml | 68 |
1 files changed, 28 insertions, 40 deletions
diff --git a/swift-deploy.yaml b/swift-deploy.yaml index 3fe8eced..e5b83de4 100644 --- a/swift-deploy.yaml +++ b/swift-deploy.yaml @@ -23,45 +23,33 @@ Resources: swift_devices: Fn::Join: - ', ' - - - Fn::Join: - - '' - - - 'r1z1-' - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } - - ':%PORT%/d1' - - Fn::Join: - - ', ' - - Merge::Map: - SwiftStorage0: - Fn::Join: - - '' - - - 'r1z1-' - - Fn::Select: - - 0 - - Fn::Select: - - 'ctlplane' - - Fn::GetAtt: - - SwiftStorage0 - - networks - - ':%PORT%/d1' + - Merge::Map: + controller0: + Fn::Join: + - '' + - - 'r1z1-' + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } + - ':%PORT%/d1' + SwiftStorage0: + Fn::Join: + - '' + - - 'r1z1-' + - Fn::Select: + - 0 + - Fn::Select: + - 'ctlplane' + - Fn::GetAtt: + - SwiftStorage0 + - networks + - ':%PORT%/d1' swift_proxy_memcache: Fn::Join: - - ', ' - - - Fn::Join: - - '' - - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } - - ':11211' - - Fn::Join: - - ', ' - - Merge::Map: - SwiftStorage0: - Fn::Join: - - '' - - - Fn::Select: - - 0 - - Fn::Select: - - 'ctlplane' - - Fn::GetAtt: - - SwiftStorage0 - - networks - - ':11211' - + - ',' + - Merge::Map: + controller0: + Fn::Join: + - ', ' + - - Fn::Join: + - '' + - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } + - ':11211' |