openstack/openstack-helm
Code Issues Proposed changes

Merge "Nova: Fix libvirtd PID check and error reporting"

Browse Source
This commit is contained in:
Jenkins 2017-08-23 01:44:31 +00:00 committed by Gerrit Code Review
commit ddc3ca4b23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/templates/bin/_libvirt.sh.tpl
View File

@ -19,8 +19,10 @@ limitations under the License.
set -ex
if [[ -f /var/run/libvirtd.pid ]]; then
test -d /proc/$(< /var/run/libvirtd.pid) && \
( echo "Libvirtd daemon is running" && exit 10 )
LIBVIRTD_PID="$(< /var/run/libvirtd.pid)"
test -d "/proc/$LIBVIRTD_PID" && \
test 'libvirtd' = "$(< /proc/$LIBVIRTD_PID/comm)" && \
( echo "ERROR: Libvirtd daemon is already running" && exit 1 )
fi
rm -f /var/run/libvirtd.pid