From 4896031757d9c9a1873ffd78fea503c837458ce3 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Mon, 29 Oct 2018 14:16:51 +0000
Subject: [PATCH] Don't set recurse on config folders

A small number of services set the recurse flag when they create
their config directory. This can change permission of files within
the directory, which are later set back to the original state. The
side effect is that the service is then restarted, even though the
net change to the config files amounts to nothing. The expected
behaviour is that a service only restarts if the config *has*
changed. This patch fixes this issue.

Change-Id: Ib6f1ca7b416247f8d455fb25892f4a3b27de03ba
Closes-Bug: 1800480
---
 ansible/roles/common/tasks/config.yml    | 1 -
 ansible/roles/heat/tasks/config.yml      | 1 -
 ansible/roles/kafka/tasks/config.yml     | 1 -
 ansible/roles/monasca/tasks/config.yml   | 1 -
 ansible/roles/storm/tasks/config.yml     | 1 -
 ansible/roles/zookeeper/tasks/config.yml | 1 -
 6 files changed, 6 deletions(-)

diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml
index 2eb838f753..041de0e9a6 100644
--- a/ansible/roles/common/tasks/config.yml
+++ b/ansible/roles/common/tasks/config.yml
@@ -16,7 +16,6 @@
   file:
     path: "{{ node_config_directory }}/{{ item }}"
     state: "directory"
-    recurse: yes
   become: true
   with_items:
     - "fluentd"
diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml
index b47f869a34..38063d33dd 100644
--- a/ansible/roles/heat/tasks/config.yml
+++ b/ansible/roles/heat/tasks/config.yml
@@ -7,7 +7,6 @@
     owner: "{{ config_owner_user }}"
     group: "{{ config_owner_group }}"
     mode: "0770"
-    recurse: yes
   when:
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
diff --git a/ansible/roles/kafka/tasks/config.yml b/ansible/roles/kafka/tasks/config.yml
index 506f7d6a02..05a926dcca 100644
--- a/ansible/roles/kafka/tasks/config.yml
+++ b/ansible/roles/kafka/tasks/config.yml
@@ -6,7 +6,6 @@
     owner: "{{ config_owner_user }}"
     group: "{{ config_owner_group }}"
     mode: "0770"
-    recurse: yes
   become: true
   when:
     - inventory_hostname in groups[item.value.group]
diff --git a/ansible/roles/monasca/tasks/config.yml b/ansible/roles/monasca/tasks/config.yml
index 539385eeb7..0616cf613d 100644
--- a/ansible/roles/monasca/tasks/config.yml
+++ b/ansible/roles/monasca/tasks/config.yml
@@ -6,7 +6,6 @@
     owner: "{{ config_owner_user }}"
     group: "{{ config_owner_group }}"
     mode: "0770"
-    recurse: yes
   become: true
   when:
     - inventory_hostname in groups[item.value.group]
diff --git a/ansible/roles/storm/tasks/config.yml b/ansible/roles/storm/tasks/config.yml
index d3238267c5..d60dec8769 100644
--- a/ansible/roles/storm/tasks/config.yml
+++ b/ansible/roles/storm/tasks/config.yml
@@ -6,7 +6,6 @@
     owner: "{{ config_owner_user }}"
     group: "{{ config_owner_group }}"
     mode: "0770"
-    recurse: yes
   become: true
   when:
     - inventory_hostname in groups[item.value.group]
diff --git a/ansible/roles/zookeeper/tasks/config.yml b/ansible/roles/zookeeper/tasks/config.yml
index 5da9b0e1d8..41ca32ac2d 100644
--- a/ansible/roles/zookeeper/tasks/config.yml
+++ b/ansible/roles/zookeeper/tasks/config.yml
@@ -6,7 +6,6 @@
     owner: "{{ config_owner_user }}"
     group: "{{ config_owner_group }}"
     mode: "0770"
-    recurse: yes
   become: true
   when:
     - inventory_hostname in groups[item.value.group]