From: Sébastien Han <seb@redhat.com>
Date: Tue, 23 Aug 2016 13:35:54 +0000 (+0200)
Subject: docker: fix more than one monitor deployment
X-Git-Tag: v1.0.6~12^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a4dbe49f7fec99957a157a1526f0e6b0ade8290b;p=ceph-ansible.git

docker: fix more than one monitor deployment

There is no need to run the actions from
roles/ceph-mon/tasks/docker/create_configs.yml
on the first monitor only since the monitor deployment happens
**serially**.
Moreover with Vagrant it's useful to allow the auto creation of the
cluster fsid, so enabling the option. If this is not desired you can
still set `fsid: 9c9c0448-0551-401d-b55b-e5b3a42bae42` for example.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/Vagrantfile b/Vagrantfile
index 5cf98d7c1..72cb68d82 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -81,7 +81,8 @@ ansible_provision = proc do |ansible|
       ceph_osd_docker_devices: settings['disks'],
       # Note that OSVM is defaulted to false above
       ceph_docker_on_openstack: OSVM,
-      ceph_rgw_civetweb_port: 8080
+      ceph_rgw_civetweb_port: 8080,
+      generate_fsid: 'true'
     }
   else
     ansible.extra_vars = {
diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml
index 802449acf..4ac1c9ea9 100644
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@@ -48,7 +48,6 @@
 # let the first mon create configs and keyrings
 - include: create_configs.yml
   when:
-    - inventory_hostname == groups.mons[0]
     - not mon_containerized_default_ceph_conf_with_kv
 
 - include: fetch_configs.yml