From c19d58fc3b136f18a88813fbae98f9ce970ee2bb Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 17 Oct 2017 18:28:06 +0200 Subject: [PATCH] rbd: fix restart script for jewel MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit c2850b11be8a69780eaceeb5bd5f3616979dd29a) Signed-off-by: Sébastien Han --- roles/ceph-config/tasks/main.yml | 5 +++-- .../ceph-defaults/templates/restart_rbd_mirror_daemon.sh.j2 | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) 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 %} -- 2.39.5