openstack/openstack-ansible
Code Issues Proposed changes

Merge "Interpret the swift_managed_regions variable correctly in with_nested loops"

Browse Source
This commit is contained in:
Jenkins 2016-01-29 10:58:43 +00:00 committed by Gerrit Code Review
commit fc036e18f7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/os_swift_sync/tasks/swift_rings_build.yml
View File

@ -68,7 +68,7 @@
command: "/usr/bin/python /etc/swift/scripts/swift_rings.py -f /etc/swift/scripts/{{ item[0] }}.contents -r {{ item[1] }}" command: "/usr/bin/python /etc/swift/scripts/swift_rings.py -f /etc/swift/scripts/{{ item[0] }}.contents -r {{ item[1] }}"
with_nested: with_nested:
- [ 'account', 'container' ] - [ 'account', 'container' ]
- "{{ swift_managed_regions }}" - swift_managed_regions
when: swift_managed_regions is defined when: swift_managed_regions is defined
sudo: yes sudo: yes
sudo_user: "{{ swift_system_user_name }}" sudo_user: "{{ swift_system_user_name }}"
@ -95,7 +95,7 @@
command: "/usr/bin/python /etc/swift/scripts/swift_rings.py -f /etc/swift/scripts/object-{{ item[0].policy.index }}.contents -r {{ item[1] }}" command: "/usr/bin/python /etc/swift/scripts/swift_rings.py -f /etc/swift/scripts/object-{{ item[0].policy.index }}.contents -r {{ item[1] }}"
with_nested: with_nested:
- "{{ swift.storage_policies }}" - "{{ swift.storage_policies }}"
- "{{ swift_managed_regions }}" - swift_managed_regions
when: swift_managed_regions is defined when: swift_managed_regions is defined
sudo: yes sudo: yes
sudo_user: "{{ swift_system_user_name }}" sudo_user: "{{ swift_system_user_name }}"

4
playbooks/roles/os_swift_sync/tasks/swift_rings_post_distribution_check.yml
View File

@ -61,7 +61,7 @@
command: "/usr/bin/python /etc/swift/scripts/swift_rings_check.py -f /etc/swift/scripts/{{ item[0] }}.contents -r {{ item[1] }}" command: "/usr/bin/python /etc/swift/scripts/swift_rings_check.py -f /etc/swift/scripts/{{ item[0] }}.contents -r {{ item[1] }}"
with_nested: with_nested:
- [ 'account', 'container' ] - [ 'account', 'container' ]
- "{{ swift_managed_regions }}" - swift_managed_regions
when: swift_managed_regions is defined when: swift_managed_regions is defined
sudo: yes sudo: yes
sudo_user: "{{ swift_system_user_name }}" sudo_user: "{{ swift_system_user_name }}"
@ -88,7 +88,7 @@
command: "/usr/bin/python /etc/swift/scripts/swift_rings_check.py -f /etc/swift/scripts/object-{{ item[0].policy.index }}.contents -r {{ item[1] }}" command: "/usr/bin/python /etc/swift/scripts/swift_rings_check.py -f /etc/swift/scripts/object-{{ item[0].policy.index }}.contents -r {{ item[1] }}"
with_nested: with_nested:
- "{{ swift.storage_policies }}" - "{{ swift.storage_policies }}"
- "{{ swift_managed_regions }}" - swift_managed_regions
when: swift_managed_regions is defined when: swift_managed_regions is defined
sudo: yes sudo: yes
sudo_user: "{{ swift_system_user_name }}" sudo_user: "{{ swift_system_user_name }}"