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 39afc7911fb3498c33a3dca60073539ed4b4612e..805656c913fe3dec6c45694e63333666c0964cdb 100644 (file)
--- 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 }}"