diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-05-21 13:06:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-05-21 13:06:42 +0000 |
| commit | db4d0a43a35a7729387c70a62bcf37dcb545640c (patch) | |
| tree | 778c93f62224a4155cedfa1e0ca489e44e276200 | |
| parent | 28e9c8e83ef778b0ca41e5080d2abdb3e882268b (diff) | |
| parent | 9d49401bdc08119dfbbeb1b50eea65e5a3f02e99 (diff) | |
Merge "Adding Swift proxy-server memcache metadata"
| -rw-r--r-- | swift-deploy.yaml | 22 | ||||
| -rw-r--r-- | swift-source.yaml | 1 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 45 |
3 files changed, 56 insertions, 12 deletions
diff --git a/swift-deploy.yaml b/swift-deploy.yaml index 1e96928f..3fe8eced 100644 --- a/swift-deploy.yaml +++ b/swift-deploy.yaml @@ -43,3 +43,25 @@ Resources: - 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' + diff --git a/swift-source.yaml b/swift-source.yaml index aee81c26..3ca2b1a8 100644 --- a/swift-source.yaml +++ b/swift-source.yaml @@ -8,6 +8,7 @@ Resources: devices: { get_input: swift_devices } hash: { get_input: swift_hash_suffix } part-power: 10 + proxy-memcache: { get_input: swift_proxy_memcache } replicas: 1 service-password: { get_input: swift_password } neutron: diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index 69236b28..f20b2752 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -39,16 +39,37 @@ Resources: - ':%PORT%/d1' - Fn::Join: - ', ' - Merge::Map: - SwiftStorage0: - Fn::Join: - - '' - - - 'r1z1-' - - Fn::Select: - - 0 + - Merge::Map: + SwiftStorage0: + Fn::Join: + - '' + - - 'r1z1-' - Fn::Select: - - 'ctlplane' - - Fn::GetAtt: - - SwiftStorage0 - - networks - - ':%PORT%/d1' + - 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' |