test_evacuate.sh: Stop using libvirt-bin
I49dc963ada17a595232d3eb329d94632d07b874b missed that call_hook_if_defined will actually cause the entire run to fail [1] if we attempt to stop the non-existent libvirt-bin service so just remove it now we are using the train UCA. [1]7a70f559c5/functions.sh (L74)
NOTE(lyarwood): The following change is also squashed into this one to unblock the nova-live-migration job on stable/ussuri. test_evacuate.sh: Support libvirt-bin and libvirtd systemd services The systemd service unit for libvirtd has changed name from libvirt-bin to libvirtd, as such the evacuation test script needs to be changed to support both as we move between these versions. Change-Id: I49dc963ada17a595232d3eb329d94632d07b874b (cherry picked from commit6c62830ae8
) Change-Id: Ife26f1ceb6208e12328ccdccbab0681ee55d5a2a (cherry picked from commit5ab9b28161
)
This commit is contained in:
parent
6474d83ec0
commit
66ad40c1e3
|
@ -63,7 +63,7 @@ echo "Forcing down the subnode so we can evacuate from it"
|
|||
openstack --os-compute-api-version 2.11 compute service set --down ${subnode} nova-compute
|
||||
|
||||
echo "Stopping libvirt on the localhost before evacuating to trigger failure"
|
||||
sudo systemctl stop libvirt-bin
|
||||
sudo systemctl stop libvirtd
|
||||
|
||||
# Now force the evacuation to *this* host; we have to force to bypass the
|
||||
# scheduler since we killed libvirtd which will trigger the libvirt compute
|
||||
|
@ -97,7 +97,7 @@ evacuate_and_wait_for_error evacuate-test
|
|||
evacuate_and_wait_for_error evacuate-bfv-test
|
||||
|
||||
echo "Now restart libvirt and perform a successful evacuation"
|
||||
sudo systemctl start libvirt-bin
|
||||
sudo systemctl start libvirtd
|
||||
sleep 10
|
||||
|
||||
# Wait for the compute service to be enabled.
|
||||
|
|
Loading…
Reference in New Issue