Merge pull request #1157 from ceph/ceph-fsid

common: do not regenerate a cluster fsid if cluster exits
pull/1168/head
Sébastien Han 2016-12-08 18:55:21 +01:00 committed by GitHub
commit 7b0602c224
2 changed files with 23 additions and 3 deletions

View File

@ -5,6 +5,18 @@
always_run: yes
register: ceph_version
- name: is ceph running already?
command: ceph --connect-timeout 3 --cluster {{ cluster }} fsid
changed_when: false
failed_when: false
always_run: yes
register: ceph_current_fsid
delegate_to: "{{ groups.mons[0] }}"
- set_fact:
fsid: "{{ ceph_current_fsid.stdout }}"
when: ceph_current_fsid.rc == 0
- set_fact:
ceph_version: "{{ ceph_version.stdout.split(' ')[2] }}"

View File

@ -186,14 +186,22 @@
run_once: true
when: cephx or generate_fsid
- name: generate cluster uuid
- name: generate cluster fsid
local_action: shell python -c 'import uuid; print(str(uuid.uuid4()))' | tee {{ fetch_directory }}/ceph_cluster_uuid.conf
creates="{{ fetch_directory }}/ceph_cluster_uuid.conf"
register: cluster_uuid
become: false
when: generate_fsid
when:
- generate_fsid
- ceph_current_fsid.rc != 0
- name: read cluster uuid if it already exists
- name: reuse cluster fsid when cluster is already running
local_action: shell echo {{ fsid }} | tee {{ fetch_directory }}/ceph_cluster_uuid.conf
creates="{{ fetch_directory }}/ceph_cluster_uuid.conf"
become: false
when: ceph_current_fsid.rc == 0
- name: read cluster fsid if it already exists
local_action: command cat {{ fetch_directory }}/ceph_cluster_uuid.conf
removes="{{ fetch_directory }}/ceph_cluster_uuid.conf"
changed_when: false