Stop using openstack server remove floating ip

The openstack server remove floating ip CLI no longer works
with python-novaclient 10.0.0 directly because novaclient
removed it's deprecated API bindings for updating a floating
IP to unset it's associated port.

We need to fix python-openstackclient, deprecate that CLI and
eventually remove it, but at the same time, we can get ahead of
that deprecation and change to the 'floating ip unset --port' CLI.

Change-Id: I63d69bc2b96df04777f00f32930e92564e33e8c2
Closes-Bug: #1745795
This commit is contained in:
Matt Riedemann 2018-01-27 21:18:16 -05:00
parent b7dbc632b6
commit fce6befbb5
2 changed files with 4 additions and 2 deletions

View File

@ -138,7 +138,8 @@ function verify_noapi {
function destroy {
_nova_set_user
openstack server remove floating ip $NOVA_SERVER $(resource_get nova nova_server_ip)
# Disassociate the floating IP from the server.
openstack floating ip unset --port $(resource_get nova nova_server_ip)
openstack floating ip delete $(resource_get nova nova_server_float)
openstack server delete --wait $NOVA_SERVER

View File

@ -244,7 +244,8 @@ function verify_noapi {
function destroy {
_cinder_set_user
openstack server remove floating ip $CINDER_SERVER $(resource_get cinder cinder_server_ip)
# Disassociate the floating IP from the server.
openstack floating ip unset --port $(resource_get cinder cinder_server_ip)
openstack floating ip delete $(resource_get cinder cinder_server_float)
openstack server delete --wait $CINDER_SERVER