From 464fefb1ef0daddd33a08f1645a5bbb8e24b98df Mon Sep 17 00:00:00 2001
From: Jason Anderson <jasonanderson@uchicago.edu>
Date: Fri, 21 Jun 2019 15:48:30 -0500
Subject: [PATCH] [gnocchi] Don't recursively modify file perms on start

For deployments with a lot of Gnocchi data, this is a non-starter
(literally... the service basically can't start.) There maybe needs to
be a way to configure this, or only do it during deploy/bootstrap?
Unclear, but disabling for now; users can `chown -R gnocchi:gnocchi`
themselves in the meantime if need be.

Change-Id: I0bae6dfbbee9f63506c89bd6b392e7be07fd5930
---
 ansible/roles/gnocchi/templates/gnocchi-api.json.j2     | 3 +--
 ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2 | 3 +--
 ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2  | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2
index 0e7ce9baff..9fb1179d6c 100644
--- a/ansible/roles/gnocchi/templates/gnocchi-api.json.j2
+++ b/ansible/roles/gnocchi/templates/gnocchi-api.json.j2
@@ -38,8 +38,7 @@
     "permissions": [
         {
             "path": "/var/lib/gnocchi",
-            "owner": "gnocchi:gnocchi",
-            "recurse": true
+            "owner": "gnocchi:gnocchi"
         },
         {
             "path": "/var/log/kolla/gnocchi",
diff --git a/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
index 6d97e2910b..fbbcd89a4a 100644
--- a/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
+++ b/ansible/roles/gnocchi/templates/gnocchi-metricd.json.j2
@@ -29,8 +29,7 @@
     "permissions": [
         {
             "path": "/var/lib/gnocchi",
-            "owner": "gnocchi:gnocchi",
-            "recurse": true
+            "owner": "gnocchi:gnocchi"
         },
         {
             "path": "/var/log/kolla/gnocchi",
diff --git a/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2 b/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
index 9f76af78f1..9a9203dcfb 100644
--- a/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
+++ b/ansible/roles/gnocchi/templates/gnocchi-statsd.json.j2
@@ -29,8 +29,7 @@
     "permissions": [
         {
             "path": "/var/lib/gnocchi",
-            "owner": "gnocchi:gnocchi",
-            "recurse": true
+            "owner": "gnocchi:gnocchi"
         },
         {
             "path": "/var/log/kolla/gnocchi",