mon: check if an initial monitor keyring already exists

When adding a new monitor, we must reuse the existing initial monitor
keyring. Otherwise, the new monitor will issue its 'mkfs' with a new
monitor keyring and it will result with a mismatch between them. The
new monitor will be unable to join the quorum in the end.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
Co-authored-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit edf1ee2073)
pull/3866/head
Guillaume Abrioux 2019-01-30 10:11:26 +01:00
parent 1c3fbe5a60
commit f8b69694cc
1 changed files with 24 additions and 10 deletions

View File

@ -1,4 +1,15 @@
--- ---
- name: check if monitor initial keyring already exists
command: >
{{ hostvars[groups[mon_group_name][0]]['docker_exec_cmd'] | default('') }}
ceph --cluster ceph --name mon. -k
/var/lib/ceph/mon/{{ cluster }}-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }}/keyring
auth get-key mon.
register: initial_mon_key
run_once: True
delegate_to: "{{ groups.get(mon_group_name, [])[0] }}"
when: ceph_current_status.fsid is defined
- name: generate monitor initial keyring - name: generate monitor initial keyring
shell: > shell: >
python -c "import os ; import struct ; python -c "import os ; import struct ;
@ -6,17 +17,22 @@
header = struct.pack('<hiih',1,int(time.time()),0,len(key)) ; header = struct.pack('<hiih',1,int(time.time()),0,len(key)) ;
print(base64.b64encode(header + key).decode())" print(base64.b64encode(header + key).decode())"
register: monitor_keyring register: monitor_keyring
when: cephx run_once: True
run_once: true # must run on a single mon only delegate_to: "{{ groups.get(mon_group_name, [])[0] }}"
when:
- initial_mon_key.skipped is defined
- ceph_current_status.fsid is undefined
# add code to read the key or/and try to find it on other nodes - name: get initial keyring when it already exists
set_fact:
monitor_keyring: "{{ initial_mon_key.stdout if monitor_keyring.skipped is defined else monitor_keyring.stdout if initial_mon_key.skipped is defined }}"
- name: create monitor initial keyring - name: create monitor initial keyring
ceph_key: ceph_key:
name: mon. name: mon.
state: present state: present
dest: "/var/lib/ceph/tmp/" dest: "/var/lib/ceph/tmp/"
secret: "{{ monitor_keyring.stdout }}" secret: "{{ monitor_keyring }}"
cluster: "{{ cluster }}" cluster: "{{ cluster }}"
caps: caps:
mon: allow * mon: allow *
@ -27,15 +43,13 @@
environment: environment:
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}" CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}" CEPH_CONTAINER_BINARY: "{{ container_binary }}"
when: cephx
- name: copy the initial key in /etc/ceph (for containers) - name: copy the initial key in /etc/ceph (for containers)
command: > command: >
cp /var/lib/ceph/tmp/{{ cluster }}.mon..keyring /etc/ceph/{{ cluster }}.mon.keyring cp /var/lib/ceph/tmp/{{ cluster }}.mon..keyring
/etc/ceph/{{ cluster }}.mon.keyring
changed_when: false changed_when: false
when: when: containerized_deployment
- cephx
- containerized_deployment
- name: create (and fix ownership of) monitor directory - name: create (and fix ownership of) monitor directory
file: file:
@ -109,4 +123,4 @@
args: args:
creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/store.db creates: /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/store.db
when: when:
- not cephx - not cephx