From 7636d09f9200df7cd68b30079133df4feb85ab8c Mon Sep 17 00:00:00 2001
From: Musee Ullah <lae@lae.is>
Date: Tue, 17 Jan 2017 21:13:43 +0900
Subject: [PATCH] mon: run ceph-create-keys after startup for kraken release

---
 roles/ceph-mon/tasks/ceph_keys.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index 580b7d8cd..7710669ed 100644
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -1,4 +1,15 @@
 ---
+- name: collect admin and bootstrap keys (for or after kraken release)
+  command: ceph-create-keys --cluster {{ cluster }} -i {{ monitor_name }}
+  args:
+    creates: /etc/ceph/{{ cluster }}.client.admin.keyring
+  failed_when: false
+  changed_when: false
+  always_run: true
+  when:
+    - cephx
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
+
 # NOTE (leseb): wait for mon discovery and quorum resolution
 # the admin key is not instantaneously created so we have to wait a bit
 - name: "wait for {{ cluster }}.client.admin.keyring exists"