openstack/openstack-ansible
Code Issues Proposed changes

Set a default region to avoid 'no region' messages

Browse Source 
* Use swift default region of 1

Fixes #595
This commit is contained in:
Andy McCrae 2014-11-24 15:20:36 +00:00
parent 96edf8efa2
commit b99b8c23de
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rpc_deployment/inventory/group_vars/swift_all.yml
View File

@ -40,6 +40,7 @@ swift_account_port: "6002"
swift_default_replication_number: 3
swift_default_min_part_hours: 1
swift_default_host_zone: 0
swift_default_host_region: 1
swift_default_drive_weight: 100
## DB

2
rpc_deployment/roles/swift_ring_builder/templates/ring.contents.j2
View File

@ -65,7 +65,7 @@
{### Build an empty device which we'll update with the appropriate details #}
{% set device = {} %}
{% set weight = drive.weight | default(hostvars[host]['swift_vars']['weight'] | default(swift.weight | default(swift_default_drive_weight))) %}
{% set region = drive.region | default(hostvars[host]['swift_vars']['region'] | default(swift.region | default(1))) %}
{% set region = drive.region | default(hostvars[host]['swift_vars']['region'] | default(swift.region | default(swift_default_host_region))) %}
{% set zone = drive.zone | default(hostvars[host]['swift_vars']['zone'] | default(swift.zone | default(swift_default_host_zone))) %}
{% set repl_ip = drive.repl_ip | default( hostvars[host]['swift_vars']['repl_ip'] | default(def_repl_ip)) %}
{% set repl_port = drive.repl_port | default((hostvars[host]['swift_vars']['repl_port']) | default(port)) %}