[devstack][ci] Fix floatingip allocation

A fix was committed [1] to the python-openstackclient
project to handle VMs with multiple ports. We can
drop the workaround of setting a floating IP to the
VM's port.

[1] 013c9a4f3a

Change-Id: I67c38b4e6695c05a8272a86448ed248b492a279d
Closes-Bug: #1747721
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
This commit is contained in:
Goutham Pacha Ravi 2020-04-30 11:19:40 -07:00
parent a903282696
commit 5998d04e79

View File

@ -361,13 +361,7 @@ function create_service_share_servers {
fi fi
floating_ip=$(openstack floating ip create $PUBLIC_NETWORK_NAME --subnet $PUBLIC_SUBNET_NAME | grep 'floating_ip_address' | get_field 2) floating_ip=$(openstack floating ip create $PUBLIC_NETWORK_NAME --subnet $PUBLIC_SUBNET_NAME | grep 'floating_ip_address' | get_field 2)
# TODO(rishabh-d-dave): For time being circumvent the bug - openstack server add floating ip $vm_id $floating_ip
# https://bugs.launchpad.net/python-openstackclient/+bug/1747721
# Once fixed, replace the following 3 lines by -
# openstack server add floating ip $vm_id $floating_ip
vm_port_id=$(openstack port list --server $vm_id -c ID -f \
value)
openstack floating ip set --port $vm_port_id $floating_ip
iniset $MANILA_CONF $BE service_instance_name_or_id $vm_id iniset $MANILA_CONF $BE service_instance_name_or_id $vm_id
iniset $MANILA_CONF $BE service_net_name_or_ip $floating_ip iniset $MANILA_CONF $BE service_net_name_or_ip $floating_ip