From 97dc591badf92d39aad1bebf272cff29a62fab95 Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Tue, 18 Mar 2014 10:33:48 -0700 Subject: [PATCH] Ensure RAX's nova-agent is stopped in ironic job Need to be more diligent when working around the libvirt bug and ensure Rackspace's nova-agent is really stopped so that /proc/xen can be unmounted. The nova-agent init script apparently does a poor job of this. Change-Id: Ib906fb035d7820be9514a136b161fd71999a795b --- .../files/jenkins_job_builder/config/devstack-gate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 7ce7bdc8b7..776a15e151 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -445,6 +445,7 @@ # work around bug in libvirt-bin on rax nodes, pending fixes to bug: # https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1248025 sudo service nova-agent stop || echo '' + sudo pkill -9 nova-agent || echo '' sudo service xe-linux-distribution stop || echo '' if [ -e /proc/xen ] ; then sudo umount /proc/xen