Merge pull request #1378 from ceph/ceph-create-keys

ceph-mon: always call ceph-create-keys

roles/ceph-mon/tasks/ceph_keys.yml

@@ -1,5 +1,5 @@
 ---
-- name: collect admin and bootstrap keys (for or after kraken release)
+- name: collect admin and bootstrap keys
   command: ceph-create-keys --cluster {{ cluster }} -i {{ monitor_name }}
   args:
     creates: /etc/ceph/{{ cluster }}.client.admin.keyring
@@ -8,7 +8,7 @@
   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"