Fix ceph-mon existing cluster detection logic

After moving from data container to named volumes, ceph monmap detection
is broken. This change fix the logic by leverage kolla_docker's
idempotency creating a named volume.

Change-Id: Iabc2e2fe5f526e1a6fc2e1b1158d1702aaf4bdf9
Related-Bug: #1533368
This commit is contained in:
Qiu Yu
2016-01-15 13:41:41 -07:00
parent a755aa88e4
commit 20c0f4c3f1

View File

@@ -11,19 +11,18 @@
always_run: True always_run: True
run_once: True run_once: True
# TODO(SamYaple): Improve failed_when check - name: Creating ceph_mon_conifg volume
- name: Checking if a previous cluster exists kolla_docker:
command: docker exec ceph_mon_data stat /etc/ceph/ceph.monmap action: "create_volume"
register: exists common_options: "{{ docker_common_options }}"
changed_when: False name: "ceph_mon_config"
failed_when: False register: ceph_mon_config_volume
always_run: True
- name: Writing hostname of host with existing cluster files to temp file - name: Writing hostname of host with existing cluster files to temp file
local_action: copy content={{ ansible_hostname }} dest=/tmp/kolla_ceph_cluster mode=0600 local_action: copy content={{ ansible_hostname }} dest=/tmp/kolla_ceph_cluster mode=0600
changed_when: False changed_when: False
always_run: True always_run: True
when: exists.rc == 0 when: not ceph_mon_config_volume.changed
- name: Registering host from temp file - name: Registering host from temp file
set_fact: set_fact: