From af3eaa5a23723d3c1cc1efccf737c9666fcbf746 Mon Sep 17 00:00:00 2001
From: zhubingbing <1392607554@qq.com>
Date: Wed, 30 Nov 2016 07:20:43 +0000
Subject: [PATCH] Fix barbican upgrade permission issue

Change-Id: I08bfa65223fd42df218bfd9e81765d6f1a4e10c8
Closes-Bug: #1646008
---
 ansible/roles/barbican/templates/barbican-api.json.j2  | 10 ++++++++++
 .../templates/barbican-keystone-listener.json.j2       |  6 ++++++
 .../roles/barbican/templates/barbican-worker.json.j2   |  6 ++++++
 3 files changed, 22 insertions(+)

diff --git a/ansible/roles/barbican/templates/barbican-api.json.j2 b/ansible/roles/barbican/templates/barbican-api.json.j2
index fe8ba1b30e..5fbdea25f6 100644
--- a/ansible/roles/barbican/templates/barbican-api.json.j2
+++ b/ansible/roles/barbican/templates/barbican-api.json.j2
@@ -19,5 +19,15 @@
             "owner": "barbican",
             "perm": "0600"
         }
+    ],
+    "permissions": [
+       {
+            "path": "/var/lib/barbican",
+            "owner": "barbican:barbican"
+       },
+       {
+            "path": "/var/log/kolla/barbican",
+            "owner": "barbican:barbican"
+       }
     ]
 }
diff --git a/ansible/roles/barbican/templates/barbican-keystone-listener.json.j2 b/ansible/roles/barbican/templates/barbican-keystone-listener.json.j2
index cb7cb3e210..15fc7b54d9 100644
--- a/ansible/roles/barbican/templates/barbican-keystone-listener.json.j2
+++ b/ansible/roles/barbican/templates/barbican-keystone-listener.json.j2
@@ -7,5 +7,11 @@
             "owner": "barbican",
             "perm": "0600"
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/barbican",
+            "owner": "barbican:barbican"
+        }
     ]
 }
diff --git a/ansible/roles/barbican/templates/barbican-worker.json.j2 b/ansible/roles/barbican/templates/barbican-worker.json.j2
index 861cd6c7f0..1608df871c 100644
--- a/ansible/roles/barbican/templates/barbican-worker.json.j2
+++ b/ansible/roles/barbican/templates/barbican-worker.json.j2
@@ -7,5 +7,11 @@
             "owner": "barbican",
             "perm": "0600"
         }
+    ],
+    "permissions": [
+        {
+            "path": "/var/log/kolla/barbican",
+            "owner": "barbican:barbican"
+        }
     ]
 }