From fb9da7aa188c0537418e3614c7875435d6e95dcf Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Wed, 2 Mar 2016 17:28:31 +0000
Subject: [PATCH] Fix Swift log directory ownership

This PR sets the ownership for the swift log directories to the syslog
user instead of the swift user. Since swift uses syslog, no logs were
being created/logged to before this change.

Change-Id: I44768d4cd04108a7163169dfec2f0de774a2cf83
---
 defaults/main.yml           | 3 +++
 tasks/swift_pre_install.yml | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 7ebbdd18..3728f82e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -45,6 +45,9 @@ swift_system_group_name: swift
 swift_system_shell: /bin/bash
 swift_system_comment: swift system user
 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
 swift_delay_auth_decision: true
diff --git a/tasks/swift_pre_install.yml b/tasks/swift_pre_install.yml
index 5bb0c3f7..e931e007 100644
--- a/tasks/swift_pre_install.yml
+++ b/tasks/swift_pre_install.yml
@@ -67,7 +67,7 @@
     - { path: "/etc/swift/proxy-server" }
     - { path: "/etc/swift/scripts" }
     - { 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: "{{ swift_system_home_folder }}" }
   tags:
@@ -87,8 +87,8 @@
 - name: Test for log directory or link
   shell: |
     if [ -h "/var/log/swift"  ]; then
-      chown -h {{ swift_system_user_name }}:{{ swift_system_group_name }} "/var/log/swift"
-      chown -R {{ swift_system_user_name }}:{{ swift_system_group_name }} "$(readlink /var/log/swift)"
+      chown -h {{ swift_syslog_user_name }}:{{ swift_syslog_group_name }} "/var/log/swift"
+      chown -R {{ swift_syslog_user_name }}:{{ swift_syslog_group_name }} "$(readlink /var/log/swift)"
     else
       exit 1
     fi