From 5998d04e79c52c5048ab251247b4f00d5b761067 Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Thu, 30 Apr 2020 11:19:40 -0700
Subject: [PATCH] [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] https://opendev.org/openstack/python-openstackclient/commit/013c9a4f3a44cb0b81fc7affe9b933e701cb5dba
Change-Id: I67c38b4e6695c05a8272a86448ed248b492a279d
Closes-Bug: #1747721
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
---
devstack/plugin.sh | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 05d3f0b7d2..796539c8c6 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -361,13 +361,7 @@ function create_service_share_servers {
fi
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 -
- # 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
+ openstack server add floating ip $vm_id $floating_ip
iniset $MANILA_CONF $BE service_instance_name_or_id $vm_id
iniset $MANILA_CONF $BE service_net_name_or_ip $floating_ip