From cab32bc72777f97dfbbb43b67f779acc331d0a15 Mon Sep 17 00:00:00 2001
From: zhubingbing <1392607554@qq.com>
Date: Sat, 15 Oct 2016 17:47:07 +0800
Subject: [PATCH] Fix sahara upgrade permission issue

Change-Id: If7d28829a4c134c655e1b08df1d3ceb7e1989f3c
Partial-Bug: #1631503
---
 ansible/roles/sahara/templates/sahara-api.json.j2    | 12 ++++++++++++
 ansible/roles/sahara/templates/sahara-engine.json.j2 | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/ansible/roles/sahara/templates/sahara-api.json.j2 b/ansible/roles/sahara/templates/sahara-api.json.j2
index 73a0c983d8..f09335a36a 100644
--- a/ansible/roles/sahara/templates/sahara-api.json.j2
+++ b/ansible/roles/sahara/templates/sahara-api.json.j2
@@ -7,5 +7,17 @@
             "owner": "sahara",
             "perm": "0600"
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/lib/sahara",
+            "owner: "sahara:sahara",
+            "recurse": true
+        },
+        {
+            "path": "/var/log/kolla/sahara",
+            "owner": "sahara:sahara",
+            "recurse": true
+        }
     ]
 }
diff --git a/ansible/roles/sahara/templates/sahara-engine.json.j2 b/ansible/roles/sahara/templates/sahara-engine.json.j2
index f7ac43e1c3..5b3239142c 100644
--- a/ansible/roles/sahara/templates/sahara-engine.json.j2
+++ b/ansible/roles/sahara/templates/sahara-engine.json.j2
@@ -7,5 +7,17 @@
             "owner": "sahara",
             "perm": "0600"
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/lib/sahara",
+            "owner: "sahara:sahara",
+            "recurse": true
+        },
+        {
+            "path": "/var/log/kolla/sahara",
+            "owner": "sahara:sahara",
+            "recurse": true
+        }
     ]
 }