From fb17c969069121aa45b8041804126da40f082ffb Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Thu, 2 Mar 2017 21:47:43 -0500
Subject: Only set ownership to etcd for thirdparty datadir

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1428532
---
 roles/etcd/tasks/main.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'roles/etcd/tasks')

diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
index 17bec5352..b4ffc99e3 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -59,6 +59,13 @@
 
   # TODO: this task may not be needed with Validate permissions
 - name: Ensure etcd datadir exists
+  file:
+    path: "{{ etcd_data_dir }}"
+    state: directory
+    mode: 0700
+  when: etcd_is_containerized | bool
+
+- name: Ensure etcd datadir ownership for thirdparty datadir
   file:
     path: "{{ etcd_data_dir }}"
     state: directory
@@ -66,7 +73,7 @@
     owner: etcd
     group: etcd
     recurse: True
-  when: etcd_is_containerized | bool or etcd_is_thirdparty | bool
+  when: etcd_is_thirdparty | bool
 
   # TODO: Determine if the below reload would work here, for now just reload
 - name:
-- 
cgit v1.2.3