From de7f948b75fef7d839905f731898da04f281f19d Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Wed, 3 Jul 2019 11:26:42 -0400 Subject: [PATCH] ceph-handler: fix cluster name in socket path c90f605b5 introduces the default ceph cluster name value in the rgw socket path for the rgw restart script. But this should use the `cluster` variable instead. This commit also fixes this in the osd restart script. Signed-off-by: Dimitri Savineau --- roles/ceph-handler/templates/restart_osd_daemon.sh.j2 | 2 +- roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/ceph-handler/templates/restart_osd_daemon.sh.j2 b/roles/ceph-handler/templates/restart_osd_daemon.sh.j2 index 7607f7f51..2635f6d41 100644 --- a/roles/ceph-handler/templates/restart_osd_daemon.sh.j2 +++ b/roles/ceph-handler/templates/restart_osd_daemon.sh.j2 @@ -29,7 +29,7 @@ check_pgs() { wait_for_socket_in_container() { osd_mount_point=$({{ container_binary }} exec "$1" df --output=target | grep '/var/lib/ceph/osd/') whoami=$({{ container_binary }} exec "$1" cat $osd_mount_point/whoami) - if ! {{ container_binary }} exec "$1" timeout 10 bash -c "while [ ! -e /var/run/ceph/ceph-osd.${whoami}.asok ]; do sleep 1 ; done"; then + if ! {{ container_binary }} exec "$1" timeout 10 bash -c "while [ ! -e /var/run/ceph/{{ cluster }}-osd.${whoami}.asok ]; do sleep 1 ; done"; then echo "Timed out while trying to look for a Ceph OSD socket." echo "Abort mission!" exit 1 diff --git a/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 b/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 index 4f27de050..65f0e315f 100644 --- a/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 +++ b/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 @@ -21,7 +21,7 @@ for ((i=0; i<${RGW_NUMS}; i++)); do done declare -a SOCKETS RGW_IP={{ hostvars[inventory_hostname]['_radosgw_address'] }} -SOCKET_PREFIX="/var/run/ceph/ceph-client.rgw.${HOST_NAME}.rgw" +SOCKET_PREFIX="/var/run/ceph/{{ cluster }}-client.rgw.${HOST_NAME}.rgw" check_socket() { local i=$1 -- 2.39.5