diff options
| author | Qiu Yu <qiuyu@ebaysf.com> | 2016-01-15 13:41:41 -0700 |
|---|---|---|
| committer | Qiu Yu <qiuyu@ebaysf.com> | 2016-01-16 06:17:44 +0800 |
| commit | 20c0f4c3f166a800f6a4bc4cf1d740932090b3ed (patch) | |
| tree | 4f805a03b02778f478393e54cccaa8e6239c420c | |
| parent | a755aa88e4454b2b4540c7b1e48f3e6d4e963edb (diff) | |
| download | kolla-20c0f4c3f166a800f6a4bc4cf1d740932090b3ed.tar.gz kolla-20c0f4c3f166a800f6a4bc4cf1d740932090b3ed.zip | |
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
| -rw-r--r-- | ansible/roles/ceph/tasks/bootstrap_mons.yml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ansible/roles/ceph/tasks/bootstrap_mons.yml b/ansible/roles/ceph/tasks/bootstrap_mons.yml index 622f3b50c..49c80f53b 100644 --- a/ansible/roles/ceph/tasks/bootstrap_mons.yml +++ b/ansible/roles/ceph/tasks/bootstrap_mons.yml @@ -11,19 +11,18 @@ always_run: True run_once: True -# TODO(SamYaple): Improve failed_when check -- name: Checking if a previous cluster exists - command: docker exec ceph_mon_data stat /etc/ceph/ceph.monmap - register: exists - changed_when: False - failed_when: False - always_run: True +- name: Creating ceph_mon_conifg volume + kolla_docker: + action: "create_volume" + common_options: "{{ docker_common_options }}" + name: "ceph_mon_config" + register: ceph_mon_config_volume - 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 changed_when: False always_run: True - when: exists.rc == 0 + when: not ceph_mon_config_volume.changed - name: Registering host from temp file set_fact: |