From f52be237708118e2c45bad9546110649401ea48d Mon Sep 17 00:00:00 2001
From: James Saint-Rossy <james_saintrossy@cable.comcast.com>
Date: Fri, 2 Sep 2016 19:31:59 -0400
Subject: [PATCH] Prevent local_action from requiring root

---
 infrastructure-playbooks/purge-cluster.yml | 2 ++
 roles/ceph-mon/tasks/start_monitor.yml     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index d5e001013..ab3eea6e8 100644
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -86,6 +86,7 @@
     ignore_errors: true
 
   - name: wait for server to boot
+    become: false
     local_action: wait_for port=22 host={{ inventory_hostname }} state=started delay=10 timeout=400
 
   - name: remove data
@@ -310,6 +311,7 @@
 
   - name: is reboot needed
     local_action: shell echo requesting reboot
+    become: false
     notify:
       - restart machine
       - wait for server to boot
diff --git a/roles/ceph-mon/tasks/start_monitor.yml b/roles/ceph-mon/tasks/start_monitor.yml
index 641461662..1842802c9 100644
--- a/roles/ceph-mon/tasks/start_monitor.yml
+++ b/roles/ceph-mon/tasks/start_monitor.yml
@@ -23,7 +23,7 @@
 # legacy ceph system v init scripts require a mon section in order to work
 - name: add mon section into ceph.conf for systemv init scripts
   ini_file:
-    dest: /etc/ceph/ceph.conf
+    dest: /etc/ceph/{{ cluster }}.conf
     section: mon.{{ ansible_host }}
     option: host
     value: "{{ ansible_host }}"