handler: remove some leftover in restart_*_daemon.sh.j2

Remove some legacy in those restart script.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/roles/ceph-handler/templates/restart_mds_daemon.sh.j2 b/roles/ceph-handler/templates/restart_mds_daemon.sh.j2
index f265546f9b3ad2800adf3844cbbd085fbb7ca628..db817e6d8235e099f78c64e990a8ba03670f2e33 100644 (file)
--- a/roles/ceph-handler/templates/restart_mds_daemon.sh.j2
+++ b/roles/ceph-handler/templates/restart_mds_daemon.sh.j2
@@ -14,7 +14,6 @@ $DOCKER_EXEC test -S /var/run/ceph/{{ cluster }}-mds.{{ ansible_hostname }}.asok
 # First, restart the daemon
 systemctl restart ceph-mds@${MDS_NAME}
 
-COUNT=10
 # Wait and ensure the socket exists after restarting the daemds
 while [ $RETRIES -ne 0 ]; do
   $DOCKER_EXEC test -S $SOCKET && exit 0

diff --git a/roles/ceph-handler/templates/restart_mgr_daemon.sh.j2 b/roles/ceph-handler/templates/restart_mgr_daemon.sh.j2
index 2b06a04af69bc903fb60cd10dfc290ed4b1c3b81..d9dc72801d790ddd01e5e0ebef76c8090131b136 100644 (file)
--- a/roles/ceph-handler/templates/restart_mgr_daemon.sh.j2
+++ b/roles/ceph-handler/templates/restart_mgr_daemon.sh.j2
@@ -15,7 +15,6 @@ systemctl reset-failed ceph-mgr@${MGR_NAME}
 # First, restart the daemon
 systemctl restart ceph-mgr@${MGR_NAME}
 
-COUNT=10
 # Wait and ensure the socket exists after restarting the daemds
 while [ $RETRIES -ne 0 ]; do
   $DOCKER_EXEC test -S $SOCKET && exit 0

diff --git a/roles/ceph-handler/templates/restart_nfs_daemon.sh.j2 b/roles/ceph-handler/templates/restart_nfs_daemon.sh.j2
index 5828e1ac63758f1706ac4a6b0a8c17d4bd53ed12..628b05fe4b4eb2ffe6bd7001df55b94c45562c7a 100644 (file)
--- a/roles/ceph-handler/templates/restart_nfs_daemon.sh.j2
+++ b/roles/ceph-handler/templates/restart_nfs_daemon.sh.j2
@@ -11,7 +11,6 @@ DOCKER_EXEC="docker exec ceph-nfs-{{ ansible_hostname }}"
 # First, restart the daemon
 {% if containerized_deployment -%}
 systemctl restart $NFS_NAME
-COUNT=10
 # Wait and ensure the pid exists after restarting the daemon
 while [ $RETRIES -ne 0 ]; do
   $DOCKER_EXEC test -f $PID && exit 0

diff --git a/roles/ceph-handler/templates/restart_rbd_mirror_daemon.sh.j2 b/roles/ceph-handler/templates/restart_rbd_mirror_daemon.sh.j2
index 44d019bfebfddd42ab3f3cdad72fa2d225848cfe..52113b6606dd5b8637564a3a5fc9f6602f1a4f9c 100644 (file)
--- a/roles/ceph-handler/templates/restart_rbd_mirror_daemon.sh.j2
+++ b/roles/ceph-handler/templates/restart_rbd_mirror_daemon.sh.j2
@@ -14,7 +14,6 @@ $DOCKER_EXEC test -S /var/run/ceph/{{ cluster }}-client.rbd-mirror.{{ ansible_ho
 # First, restart the daemon
 systemctl restart ceph-rbd-mirror@rbd-mirror.${RBD_MIRROR_NAME}
 
-COUNT=10
 # Wait and ensure the socket exists after restarting the daemon
 while [ $RETRIES -ne 0 ]; do
   $DOCKER_EXEC test -S $SOCKET && exit 0