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

ceph-mon: always call ceph-create-keys
pull/1384/head
Alfredo Deza 2017-03-20 10:25:27 -04:00 committed by GitHub
commit fc54ee2f87
1 changed files with 2 additions and 2 deletions

View File

@ -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 }} command: ceph-create-keys --cluster {{ cluster }} -i {{ monitor_name }}
args: args:
creates: /etc/ceph/{{ cluster }}.client.admin.keyring creates: /etc/ceph/{{ cluster }}.client.admin.keyring
@ -8,7 +8,7 @@
always_run: true always_run: true
when: when:
- cephx - cephx
- ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
# NOTE (leseb): wait for mon discovery and quorum resolution # NOTE (leseb): wait for mon discovery and quorum resolution
# the admin key is not instantaneously created so we have to wait a bit # the admin key is not instantaneously created so we have to wait a bit
- name: "wait for {{ cluster }}.client.admin.keyring exists" - name: "wait for {{ cluster }}.client.admin.keyring exists"