From: Jan Provaznik Date: Wed, 30 Jul 2014 11:40:01 +0000 (-0400) Subject: Fix swift memcache and device properties X-Git-Tag: opnfv-6.0.0~2787^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=82c50c15a8e0fb2e2c397fde6f9b03217482dbfa;p=apex-tripleo-heat-templates.git Fix swift memcache and device properties All controller nodes are added into the list of swift devices and into the list of memcache servers. This patch also removes swift storage nodes from the list of memcache servers - I don't think that each storage node should run proxy server (also swift-storage element doesn't depend on swift-proxy). Change-Id: Idb2ce2e2050fb84d8f8b564626b20e7b059fd685 --- 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'