openstack/openstack-ansible
Code Issues Proposed changes

Merge "Target AIO swift vars at specific containers"

Browse Source
This commit is contained in:
Jenkins 2015-07-22 19:24:44 +00:00 committed by Gerrit Code Review
commit 4f405f4704
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/openstack_deploy/conf.d/swift.yml.aio
View File

@ -19,6 +19,7 @@ swift-proxy_hosts:
ip: 172.29.236.100 ip: 172.29.236.100
container_vars: container_vars:
swift_proxy_vars: swift_proxy_vars:
limit_container_types: swift_proxy
read_affinity: "r1=100" read_affinity: "r1=100"
write_affinity: "r1" write_affinity: "r1"
write_affinity_node_count: "1 * replicas" write_affinity_node_count: "1 * replicas"
@ -27,5 +28,6 @@ swift_hosts:
ip: 172.29.236.100 ip: 172.29.236.100
container_vars: container_vars:
swift_vars: swift_vars:
limit_container_types: swift
zone: 0 zone: 0
region: 1 region: 1

2
playbooks/inventory/dynamic_inventory.py
View File

@ -272,7 +272,7 @@ def _append_to_host_groups(inventory, container_type, assignment, host_type,
'limit_container_types', None 'limit_container_types', None
) )
if limit is None or limit in container: if limit is None or (component and limit in component):
hdata[_keys] = options hdata[_keys] = options