From 423c5d0b5eeb86c690ad5529831acfaeb81efa0a Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Wed, 16 May 2018 15:05:02 +0200
Subject: [PATCH] Debian: correct /var/log/swift unix rights

Debian package uses swift:adm with 0750, let's not force something else,
as this makes the puppet run not indempotent.

Change-Id: I325e2f722b11deb51a1b8f40d21fddac4593834c
---
 manifests/swift.pp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/manifests/swift.pp b/manifests/swift.pp
index 18930fc15..e1c93e3f1 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -13,9 +13,16 @@ class openstack_integration::swift {
     require => Package['rsyslog'],
   }
 
-  file { '/var/log/swift':
-    ensure => directory,
-    mode   => '0755',
+  if ($::os_package_type == 'debian') {
+    file { '/var/log/swift':
+      ensure => directory,
+      mode   => '0750',
+    }
+  } else {
+    file { '/var/log/swift':
+      ensure => directory,
+      mode   => '0755',
+    }
   }
   file { '/etc/rsyslog.d/10-swift.conf':
     ensure  => present,
@@ -28,7 +35,7 @@ class openstack_integration::swift {
   if $::osfamily == 'Debian' {
     if $::os_package_type == 'debian' {
       File<| title == '/var/log/swift' |> {
-        owner => 'root',
+        owner => 'swift',
         group => 'adm'
       }
     } else {