diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-19 17:48:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-19 17:48:36 +0000 |
| commit | 0416913fb5fc1ab8adc3f69dbb766984b78d4f5a (patch) | |
| tree | 01fbd6e8349a05f0ed593d67b211cad18f6223d3 | |
| parent | 94c27176378311171b1412d9d6c56904a94d70a3 (diff) | |
| parent | 20c0f4c3f166a800f6a4bc4cf1d740932090b3ed (diff) | |
| download | kolla-0416913fb5fc1ab8adc3f69dbb766984b78d4f5a.tar.gz kolla-0416913fb5fc1ab8adc3f69dbb766984b78d4f5a.zip | |
Merge "Fix ceph-mon existing cluster detection logic"
| -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: |