openstack
/
devstack
Code Issues Proposed changes

Merge "Confirm network is created before setting public_network_id"

This commit is contained in:
Jenkins 2017-01-13 18:39:19 +00:00 committed by Gerrit Code Review
parent 775c8f4924 8e14240d23
commit 9a133d1ab0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tempest
View File

@ -241,7 +241,9 @@ function configure_tempest {
# the public network (for floating ip access) is only available
# if the extension is enabled.
if is_networking_extension_supported 'external-net'; then
# If NEUTRON_CREATE_INITIAL_NETWORKS is not true, there is no network created
# and the public_network_id should not be set.
if [[ "$NEUTRON_CREATE_INITIAL_NETWORKS" == "True" ]] && is_networking_extension_supported 'external-net'; then
public_network_id=$(openstack network show -f value -c id $PUBLIC_NETWORK_NAME)
fi