openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Fix Swift log directory ownership"

Browse Source
This commit is contained in:
Jenkins 2016-03-03 22:51:48 +00:00 committed by Gerrit Code Review
commit 874646a495
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -45,6 +45,9 @@ swift_system_group_name: swift
swift_system_shell: /bin/bash swift_system_shell: /bin/bash
swift_system_comment: swift system user swift_system_comment: swift system user
swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}" swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}"
## Swift Syslog User / Group
swift_syslog_user_name: syslog
swift_syslog_group_name: syslog
## Auth token ## Auth token
swift_delay_auth_decision: true swift_delay_auth_decision: true

6
tasks/swift_pre_install.yml
View File

@ -66,7 +66,7 @@
- { path: "/etc/swift/proxy-server" } - { path: "/etc/swift/proxy-server" }
- { path: "/etc/swift/scripts" } - { path: "/etc/swift/scripts" }
- { path: "/etc/swift/ring_build_files" } - { path: "/etc/swift/ring_build_files" }
- { path: "/openstack/log/{{ inventory_hostname }}", owner: "syslog", group: "syslog" } - { path: "/openstack/log/{{ inventory_hostname }}", owner: "{{ swift_syslog_user_name }}", group: "{{ swift_syslog_group_name }}" }
- { path: "/var/cache/swift" } - { path: "/var/cache/swift" }
- { path: "{{ swift_system_home_folder }}" } - { path: "{{ swift_system_home_folder }}" }
tags: tags:
@ -86,8 +86,8 @@
- name: Test for log directory or link - name: Test for log directory or link
shell: | shell: |
if [ -h "/var/log/swift" ]; then if [ -h "/var/log/swift" ]; then
chown -h {{ swift_system_user_name }}:{{ swift_system_group_name }} "/var/log/swift" chown -h {{ swift_syslog_user_name }}:{{ swift_syslog_group_name }} "/var/log/swift"
chown -R {{ swift_system_user_name }}:{{ swift_system_group_name }} "$(readlink /var/log/swift)" chown -R {{ swift_syslog_user_name }}:{{ swift_syslog_group_name }} "$(readlink /var/log/swift)"
else else
exit 1 exit 1
fi fi