From ea9b1577ad601c77a0af188149d49303e431f4a9 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Wed, 8 Mar 2017 10:56:08 +0000
Subject: [PATCH] Apply correct permissions to kolla_logs/ceilometer

Ceilometer-*.json does not apply permissions at
kolla_logs/ceilometer as other roles do at config.json.
This is causing ceilometer-central to keep restarting
due cannot read/write to ceilometer-polling.log file.

Change-Id: I865bf01d6c3d87f1a2cf31976ca9e46bcbcad744
Closes-Bug: #1671020
---
 ansible/roles/ceilometer/templates/ceilometer-api.json.j2  | 7 +++++++
 .../roles/ceilometer/templates/ceilometer-central.json.j2  | 7 +++++++
 .../ceilometer/templates/ceilometer-collector.json.j2      | 7 +++++++
 .../roles/ceilometer/templates/ceilometer-compute.json.j2  | 7 +++++++
 .../ceilometer/templates/ceilometer-notification.json.j2   | 7 +++++++
 5 files changed, 35 insertions(+)

diff --git a/ansible/roles/ceilometer/templates/ceilometer-api.json.j2 b/ansible/roles/ceilometer/templates/ceilometer-api.json.j2
index 500f9979fc..0f8f16b86a 100644
--- a/ansible/roles/ceilometer/templates/ceilometer-api.json.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer-api.json.j2
@@ -23,5 +23,12 @@
             "perm": "0600",
             "optional": true
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/ceilometer",
+            "owner": "ceilometer:ceilometer",
+            "recurse": true
+        }
     ]
 }
diff --git a/ansible/roles/ceilometer/templates/ceilometer-central.json.j2 b/ansible/roles/ceilometer/templates/ceilometer-central.json.j2
index 3468478874..e20257b15a 100644
--- a/ansible/roles/ceilometer/templates/ceilometer-central.json.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer-central.json.j2
@@ -14,5 +14,12 @@
             "perm": "0600",
             "optional": true
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/ceilometer",
+            "owner": "ceilometer:ceilometer",
+            "recurse": true
+        }
     ]
 }
diff --git a/ansible/roles/ceilometer/templates/ceilometer-collector.json.j2 b/ansible/roles/ceilometer/templates/ceilometer-collector.json.j2
index 99da6248a5..1d46da006b 100644
--- a/ansible/roles/ceilometer/templates/ceilometer-collector.json.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer-collector.json.j2
@@ -14,5 +14,12 @@
             "perm": "0600",
             "optional": true
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/ceilometer",
+            "owner": "ceilometer:ceilometer",
+            "recurse": true
+        }
     ]
 }
diff --git a/ansible/roles/ceilometer/templates/ceilometer-compute.json.j2 b/ansible/roles/ceilometer/templates/ceilometer-compute.json.j2
index 9a71849958..b68dbc0311 100644
--- a/ansible/roles/ceilometer/templates/ceilometer-compute.json.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer-compute.json.j2
@@ -14,5 +14,12 @@
             "perm": "0600",
             "optional": true
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/ceilometer",
+            "owner": "ceilometer:ceilometer",
+            "recurse": true
+        }
     ]
 }
diff --git a/ansible/roles/ceilometer/templates/ceilometer-notification.json.j2 b/ansible/roles/ceilometer/templates/ceilometer-notification.json.j2
index 354ecf7a95..2ee3522721 100644
--- a/ansible/roles/ceilometer/templates/ceilometer-notification.json.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer-notification.json.j2
@@ -32,5 +32,12 @@
             "perm": "0600",
             "optional": true
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/ceilometer",
+            "owner": "ceilometer:ceilometer",
+            "recurse": true
+        }
     ]
 }