openstack
/
murano
Code Issues Proposed changes

Adjust region name for network selection in devstack 

- Use openstack client with region parameters to determine
external network id

Change-Id: I2ec2f395d12ea144853ddc6ed5fa4b1cba496825
Closes-Bug: #1618999
This commit is contained in:
Victor Ryzhenkin 2016-09-02 15:46:54 +03:00 committed by Victor Ryzhenkin (freerunner)
parent 0e21250f37
commit cdd248de13
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/plugin.sh
View File

@ -117,13 +117,15 @@ function configure_murano_networking {
# If it was set but the network is not exist then
# first available external network will be selected.
local ext_net=${MURANO_EXTERNAL_NETWORK:-'public'}
local ext_net_id=$(neutron net-external-list \
| grep " $ext_net " | get_field 2)
local ext_net_id=$(openstack --os-cloud devstack-admin
--os-region "$REGION_NAME" network list
--external | grep " $ext_net " | get_field 1)
# Try to select first available external network
if [[ -n "$ext_net_id" ]]; then
ext_net_id=$(neutron net-external-list -f csv -c id \
| tail -n +2 | tail -n 1)
ext_net_id=$(openstack --os-cloud devstack-admin
--os-region "$REGION_NAME" network list
--external -f csv -c ID | tail -n +2 | tail -n 1)
fi
# Configure networking options for Murano