openstack/openstack-ansible
Code Issues Proposed changes

Merge "Distribute rings to build dir on all swift_hosts"

Browse Source
This commit is contained in:
Jenkins 2015-04-16 06:19:30 +00:00 committed by Gerrit Code Review
commit 450c061e6c
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/os_swift/tasks/swift_pre_install.yml
View File

@ -47,7 +47,7 @@
- { path: "/etc/swift/object-server" } - { path: "/etc/swift/object-server" }
- { path: "/etc/swift/proxy-server" } - { path: "/etc/swift/proxy-server" }
- { path: "/etc/swift/scripts" } - { path: "/etc/swift/scripts" }
- { path: "/etc/swift/rings" } - { path: "/etc/swift/ring_build_files" }
- { path: "/openstack/log/{{ inventory_hostname }}", owner: "syslog", group: "syslog" } - { path: "/openstack/log/{{ inventory_hostname }}", owner: "syslog", group: "syslog" }
- { path: "/var/cache/swift" } - { path: "/var/cache/swift" }
- { path: "/var/lock/swift" } - { path: "/var/lock/swift" }

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

@ -58,7 +58,7 @@
sudo: yes sudo: yes
sudo_user: "{{ swift_system_user_name }}" sudo_user: "{{ swift_system_user_name }}"
args: args:
chdir: /etc/swift/rings/ chdir: /etc/swift/ring_build_files/
tags: tags:
- swift-rings - swift-rings
- swift-rings-build - swift-rings-build
@ -70,7 +70,7 @@
sudo: yes sudo: yes
sudo_user: "{{ swift_system_user_name }}" sudo_user: "{{ swift_system_user_name }}"
args: args:
chdir: /etc/swift/rings/ chdir: /etc/swift/ring_build_files/
tags: tags:
- swift-rings - swift-rings
- swift-rings-build - swift-rings-build

2
playbooks/roles/os_swift/tasks/swift_rings_check.yml
View File

@ -15,7 +15,7 @@
- name: Get md5sum of local builder files - name: Get md5sum of local builder files
shell: | shell: |
cat /etc/swift/rings/*.builder 2>/dev/null | md5sum | cut -d " " -f1 cat /etc/swift/ring_build_files/*.builder 2>/dev/null | md5sum | cut -d " " -f1
register: md5sum register: md5sum
tags: tags:
- swift-ring-check - swift-ring-check

15
playbooks/roles/os_swift/tasks/swift_rings_distribute.yml
View File

@ -17,9 +17,22 @@
shell: | shell: |
rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \ rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
-avz \ -avz \
{{ swift_system_user_name }}@{{ hostvars[groups['swift_hosts'][0]]['ansible_ssh_host'] }}:/etc/swift/rings/ \ {{ swift_system_user_name }}@{{ hostvars[groups['swift_hosts'][0]]['ansible_ssh_host'] }}:/etc/swift/ring_build_files/ \
/etc/swift/ /etc/swift/
sudo: yes sudo: yes
sudo_user: "{{ swift_system_user_name }}" sudo_user: "{{ swift_system_user_name }}"
tags: tags:
- swift-get-rings - swift-get-rings
# This task will backup the swift rings files on each node
# This task will prevent an issue if swift_hosts[0] were removed/changes
- name: "Copy swift rings to /etc/swift/ring_build_files for backup"
shell: |
rsync -e 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
-avz \
{{ swift_system_user_name }}@{{ hostvars[groups['swift_hosts'][0]]['ansible_ssh_host'] }}:/etc/swift/ring_build_files/ \
/etc/swift/ring_build_files/
sudo: yes
sudo_user: "{{ swift_system_user_name }}"
tags:
- swift-get-rings