ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handler: fix bug in osd handlers 

fbf4ed42ae introduced a bug when
container binary is podman.
podman doesn't support ps -f using regular expression, the container id
is never set in the restart script causing the handler to fail.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1721536

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/4252/head
Guillaume Abrioux 2019-07-18 14:06:23 +02:00
parent a64a61429d
commit 618dbf271d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-handler/templates/restart_osd_daemon.sh.j2
View File

@ -45,7 +45,7 @@ get_container_id_from_dev_name() {
local count local count
count=10 count=10
while [ $count -ne 0 ]; do while [ $count -ne 0 ]; do
id=$({{ container_binary }} ps -q -f "name=${1}$") id=$({{ container_binary }} ps | grep -E "${1}$" | cut -d' ' -f1)
test "$id" != "" && break test "$id" != "" && break
sleep $DELAY sleep $DELAY
let count=count-1 let count=count-1