From ba1eb0356580dc173ad8e2b1323fbe98886a2622 Mon Sep 17 00:00:00 2001
From: zhubingbing <1392607554@qq.com>
Date: Tue, 18 Oct 2016 11:36:58 +0800
Subject: [PATCH] Fix gnocchi upgrade permission issue

Change-Id: If22b6cf9fa3ce9f1c18e4c9a71c637e96e7c2347
Partial-Bug: #1631503
---
 .../roles/gnocchi/templates/gnocchi-api.json.j2   | 11 +++++++++++
 .../gnocchi/templates/gnocchi-metricd.json.j2     | 15 +++++++++++++++
 .../gnocchi/templates/gnocchi-statsd.json.j2      | 15 +++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2
index 373cb2154b..583e6e9a29 100644
--- a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2
+++ b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2
@@ -34,5 +34,16 @@
             "perm": "0600"
         }{% endif %}
 
+    ],
+    "permissions": [
+        {
+            "path": "/var/lib/gnocchi",
+            "owner": "gnocchi:gnocchi",
+            "recurse": true
+        },
+        {
+            "path": "/var/log/kolla/gnocchi",
+            "owner": "gnocchi:kolla"
+        }
     ]
 }
diff --git a/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
index 1d41f8e790..9188a1c8e8 100644
--- a/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
+++ b/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
@@ -19,5 +19,20 @@
             "owner": "gnocchi",
             "perm": "0600"
         }{% endif %}
+    ],
+    "permissions": [
+        {
+            "path": "/var/lib/gnocchi",
+            "owner": "gnocchi:gnocchi",
+            "recurse": true
+        },
+        {
+            "path": "/var/log/kolla/gnocchi",
+            "owner": "gnocchi:kolla"
+        },
+        {
+            "path": "/var/log/kolla/gnocchi/gnocchi-metricd.*",
+            "owner": "gnocchi:gnocchi"
+        }
     ]
 }
diff --git a/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
index 141e05f7f9..83073147b3 100644
--- a/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
+++ b/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
@@ -19,5 +19,20 @@
             "owner": "gnocchi",
             "perm": "0600"
         }{% endif %}
+    ],
+    "permissions": [
+        {
+            "path": "/var/lib/gnocchi",
+            "owner": "gnocchi:gnocchi",
+            "recurse": true
+        },
+        {
+            "path": "/var/log/kolla/gnocchi",
+            "owner": "gnocchi:kolla"
+        },
+        {
+            "path": "/var/log/kolla/gnocchi/gnocchi-statsd.*",
+            "owner": "gnocchi:gnocchi"
+        }
     ]
 }