openstack/manila
Code Issues Proposed changes

Merge "[devstack][ci] Fix floatingip allocation"

Browse Source
This commit is contained in:
Zuul 2020-05-18 21:44:26 +00:00 committed by Gerrit Code Review
commit ec6e48588a
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/plugin.sh
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