openstack
/
manila
Code Issues Proposed changes

Merge "Circumvent bug #1747721 to prevent CI failures"

This commit is contained in:
Zuul 2018-03-28 17:17:07 +00:00 committed by Gerrit Code Review
parent e41d126452 72df3cd79a
commit 9eeec6c6d2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/plugin.sh
View File

@ -332,7 +332,13 @@ 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)
openstack server add floating ip $vm_id $floating_ip
# 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
iniset $MANILA_CONF $BE service_instance_name_or_id $vm_id
iniset $MANILA_CONF $BE service_net_name_or_ip $floating_ip