openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Adding Swift proxy-server memcache metadata"

This commit is contained in:
Jenkins 2014-05-21 13:06:42 +00:00 committed by Gerrit Code Review
parent 28e9c8e83e 9d49401bdc
commit db4d0a43a3
3 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
swift-deploy.yaml
View File

@ -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'

1
swift-source.yaml
View File

@ -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:

45
swift-storage-source.yaml
View File

@ -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'