From: Sébastien Han <seb@redhat.com>
Date: Tue, 28 Mar 2017 12:15:27 +0000 (+0200)
Subject: docker: fix monitors name
X-Git-Tag: v2.2.0~1^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12b2aa2e5519dca8454418aadc89c60ebf5b595d;p=ceph-ansible.git

docker: fix monitors name

Prior to this change we were deploying a monitor using tis fqdn name but
we were checking its state and performing actions on it using its
shortname.

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

diff --git a/group_vars/docker-commons.yml.sample b/group_vars/docker-commons.yml.sample
index 56eefb621..5387550c6 100644
--- a/group_vars/docker-commons.yml.sample
+++ b/group_vars/docker-commons.yml.sample
@@ -10,6 +10,8 @@ dummy:
 #ceph_docker_registry: docker.io
 #ceph_docker_enable_centos_extra_repo: false
 
+#mon_use_fqdn: false # if set to true, the MON name used will be the fqdn
+
 # Set uid/gid to default '64045' for bootstrap directories.
 # '64045' is used for debian based distros. It must be set to 167 in case of rhel based distros.
 # These values have to be set according to the base OS used by the container image, NOT the host.
diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample
index 5e28a72e5..620a23cb2 100644
--- a/group_vars/mons.yml.sample
+++ b/group_vars/mons.yml.sample
@@ -86,7 +86,7 @@ dummy:
 #ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface
 #ceph_docker_image: "ceph/daemon"
 #ceph_docker_image_tag: latest
-#ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ ansible_hostname }}
+#ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ monitor_name }}
 #ceph_docker_on_openstack: false
 #mon_docker_privileged: false
 #mon_docker_net_host: true
diff --git a/roles/ceph-docker-common/defaults/main.yml b/roles/ceph-docker-common/defaults/main.yml
index 395acc406..86a7f9bb8 100644
--- a/roles/ceph-docker-common/defaults/main.yml
+++ b/roles/ceph-docker-common/defaults/main.yml
@@ -2,6 +2,8 @@
 ceph_docker_registry: docker.io
 ceph_docker_enable_centos_extra_repo: false
 
+mon_use_fqdn: false # if set to true, the MON name used will be the fqdn
+
 # Set uid/gid to default '64045' for bootstrap directories.
 # '64045' is used for debian based distros. It must be set to 167 in case of rhel based distros.
 # These values have to be set according to the base OS used by the container image, NOT the host.
diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 4fcaa88df..51bbe12c1 100644
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -78,7 +78,7 @@ ceph_mon_docker_interface: "{{ monitor_interface }}"
 ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface
 ceph_docker_image: "ceph/daemon"
 ceph_docker_image_tag: latest
-ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ ansible_hostname }}
+ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ monitor_name }}
 ceph_docker_on_openstack: false
 mon_docker_privileged: false
 mon_docker_net_host: true
diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml
index 8b321d61c..57d69b7fe 100644
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@@ -51,14 +51,14 @@
 - include: start_docker_monitor.yml
 
 - name: wait for monitor socket to exist
-  command: docker exec ceph-mon-{{ ansible_hostname }} stat /var/run/ceph/{{ cluster }}-mon.{{ ansible_fqdn }}.asok
+  command: docker exec ceph-mon-{{ ansible_hostname }} stat /var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok
   register: monitor_socket
   retries: 5
   delay: 15
   until: monitor_socket.rc == 0
 
 - name: force peer addition as potential bootstrap peer for cluster bringup
-  command: docker exec ceph-mon-{{ ansible_hostname }} ceph --admin-daemon /var/run/ceph/{{ cluster }}-mon.{{ ansible_fqdn }}.asok add_bootstrap_peer_hint {{ hostvars[item]['ansible_' + ceph_mon_docker_interface].ipv4.address }}
+  command: docker exec ceph-mon-{{ ansible_hostname }} ceph --admin-daemon /var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok add_bootstrap_peer_hint {{ hostvars[item]['ansible_' + ceph_mon_docker_interface].ipv4.address }}
   with_items: "{{ groups[mon_group_name] }}"
   changed_when: false
   failed_when: false