diff options
| -rw-r--r-- | swift-deploy.yaml | 68 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 67 |
2 files changed, 56 insertions, 79 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' diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index d9df5728..cbbecf10 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -49,44 +49,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' |