Merge "Fix common role upgrade permission issue"

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
+        }
     ]
 }

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"
+        }
+    ]
 }