From: Sébastien Han <seb@redhat.com>
Date: Mon, 2 Oct 2017 09:05:14 +0000 (+0200)
Subject: osd: do not copy admin key on collocated scenario
X-Git-Tag: v3.0.0rc15~3^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ba4289451608fe6177b7f9adab2c3fcaa6c3a296;p=ceph-ansible.git

osd: do not copy admin key on collocated scenario

ceph-disk used to have a bug requiring the admin key to store the
encrypted key in the mon kv store. This was reported in:
http://tracker.ceph.com/issues/17849

Fixed and backported here: https://github.com/ceph/ceph/pull/11996

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-osd/tasks/pre_requisite.yml b/roles/ceph-osd/tasks/pre_requisite.yml
index 39afc7911..805656c91 100644
--- a/roles/ceph-osd/tasks/pre_requisite.yml
+++ b/roles/ceph-osd/tasks/pre_requisite.yml
@@ -28,12 +28,6 @@
     - /var/lib/ceph/bootstrap-osd/
     - /var/lib/ceph/osd/
 
-- name: set_fact copy_admin_key
-  set_fact:
-    copy_admin_key: true
-  when:
-    - osd_scenario == 'collocated'
-
 - name: copy osd bootstrap key
   copy:
     src: "{{ fetch_directory }}/{{ fsid }}{{ item.name }}"