Merge pull request #1515 from ceph/mgr-key

mon: do not create mgr key on jewel
2017-05-12 12:02:53 -05:00 · 2017-05-12 12:02:53 -05:00 · a87b2a2636
parent 0a51552f55 f1651cea9b
commit a87b2a2636
1 changed files with 2 additions and 1 deletions
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@ -125,4 +125,5 @@
      - item.stat.exists == true
  when:
    - inventory_hostname == groups[mon_group_name]|last
-    - ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel
+    - not ceph_docker_image_tag.find('jewel') != -1
+    - ceph_docker_image != 'rhceph'