Merge "Avoiding exception if guest refuses to detach a volume" into stable/fraser

diff --combined build/overcloud-full.sh
index f7d55e5,3739fc3..13b10b9
--- 1/build/overcloud-full.sh
--- 2/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@@ -67,10 -67,10 +67,10 @@@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMI
      --upload ${BUILD_ROOT}/patches/neutron_openstackclient_dps.patch:/usr/lib/python2.7/site-packages/ \
      --upload ${BUILD_ROOT}/patches/puppet-neutron-add-sfc.patch:/usr/share/openstack-puppet/modules/neutron/ \
      --upload ${BUILD_ROOT}/patches/congress-parallel-execution.patch:/usr/lib/python2.7/site-packages/ \
 +    --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \
 +    --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \
      --install openstack-utils \
      -a overcloud-full_build.qcow2
 -#    --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \
 -#    --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \
  #    --upload ${BUILD_ROOT}/patches/puppet-neutron-add-external_network_bridge-option.patch:/usr/share/openstack-puppet/modules/neutron/ \
  #    --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-add-external_network_bridge-option.patch" \
  
@@@ -147,6 -147,8 +147,8 @@@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMI
      --install docker,kubelet,kubeadm,kubectl,kubernetes-cni \
      --upload ${BUILD_ROOT}/patches/puppet-ceph.patch:/etc/puppet/modules/ceph/ \
      --run-command "cd /etc/puppet/modules/ceph && patch -p1 < puppet-ceph.patch" \
+     --upload ${BUILD_ROOT}/patches/fix_volume_exception.patch:/usr/lib/python2.7/site-packages/ \
+     --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < fix_volume_exception.patch" \
      -a overcloud-full_build.qcow2
  
      # upload and install barometer packages