From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 17 Oct 2017 16:28:06 +0000 (+0200)
Subject: rbd: fix restart script for jewel
X-Git-Tag: v3.0.3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c19d58fc3b136f18a88813fbae98f9ce970ee2bb;p=ceph-ansible.git

rbd: fix restart script for jewel

In Jewel, we don't use bootstrap-rbd keyring for rbd-mirror nodes, it
results with a socket path/name different according to which ceph
release you are deploying.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit c2850b11be8a69780eaceeb5bd5f3616979dd29a)
Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index 4a5df3350..476717e51 100644
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -51,7 +51,8 @@
       - restart ceph osds
       - restart ceph mdss
       - restart ceph rgws
-      - restart ceph nfss
+      - restart ceph mgrs
+      - restart ceph rbdmirrors
   when:
     - not containerized_deployment|bool
 
@@ -117,8 +118,8 @@
       - restart ceph osds
       - restart ceph mdss
       - restart ceph rgws
-      - restart ceph rbdmirrors
       - restart ceph mgrs
+      - restart ceph rbdmirrors
 
   - name: set fsid fact when generate_fsid = true
     set_fact:
diff --git a/roles/ceph-defaults/templates/restart_rbd_mirror_daemon.sh.j2 b/roles/ceph-defaults/templates/restart_rbd_mirror_daemon.sh.j2
index 5a7ee6940..d3ceb6ff5 100644
--- a/roles/ceph-defaults/templates/restart_rbd_mirror_daemon.sh.j2
+++ b/roles/ceph-defaults/templates/restart_rbd_mirror_daemon.sh.j2
@@ -3,7 +3,11 @@
 RETRIES="{{ handler_health_rbd_mirror_check_retries }}"
 DELAY="{{ handler_health_rbd_mirror_check_delay }}"
 RBD_MIRROR_NAME="{{ ansible_hostname }}"
+{% if ceph_release_num[ceph_release] < ceph_release_num['luminous'] %}
+SOCKET=/var/run/ceph/{{ cluster }}-client.admin.asok
+{% else %}
 SOCKET=/var/run/ceph/{{ cluster }}-client.rbd-mirror.${RBD_MIRROR_NAME}.asok
+{% endif %}
 {% if containerized_deployment %}
 DOCKER_EXEC="docker exec ceph-rbd-mirror-{{ ansible_hostname }}"
 {% endif %}