From ecab56a1826ce9f31d0b5da8497240e525afde9a Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Mon, 17 Oct 2016 14:13:29 +0800
Subject: [PATCH] Fix common role upgrade permission issue

Change-Id: I0f989b8a0ebd30424f71619981775d75ff1db691
Partial-Bug: #1631503
---
 ansible/roles/common/templates/heka.json.j2          | 12 ++++++++++++
 ansible/roles/common/templates/kolla-toolbox.json.j2 |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/common/templates/heka.json.j2 b/ansible/roles/common/templates/heka.json.j2
index bb2ae35040..4013c8685e 100644
--- a/ansible/roles/common/templates/heka.json.j2
+++ b/ansible/roles/common/templates/heka.json.j2
@@ -101,5 +101,17 @@
         }{% if not loop.last %},{% endif %}
 {% endfor %}
 
+    ],
+    "permissions": [
+        {
+            "path": "/var/cache/hekad",
+            "owner": "heka:heka",
+            "recurse": true
+        },
+        {
+            "path": "/var/lib/kolla/heka",
+            "owner": "heka:heka",
+            "recurse": true
+        }
     ]
 }
diff --git a/ansible/roles/common/templates/kolla-toolbox.json.j2 b/ansible/roles/common/templates/kolla-toolbox.json.j2
index 220022a9da..7f0dc05193 100644
--- a/ansible/roles/common/templates/kolla-toolbox.json.j2
+++ b/ansible/roles/common/templates/kolla-toolbox.json.j2
@@ -1,4 +1,10 @@
 {
     "command": "sleep infinity",
-    "config_files": []
+    "config_files": [],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/ansible.log",
+            "owner": "ansible:ansible"
+        }
+    ]
 }