openinfra
/
python-tempestconf
Code Issues Proposed changes

Merge "Adding floating_network_name to network section"

This commit is contained in:
Luigi Toscano 2017-01-20 06:35:53 -05:00 committed by Gerrit Code Review
parent 5aadb968ca ba46bd7c85
commit 4a89425f42
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config_tempest/config_tempest.py
View File

@ -696,6 +696,7 @@ def create_tempest_networks(clients, conf, has_neutron, public_network_id):
if network['router:external'] and network['subnets']:
LOG.info("Found network, using: {0}".format(network['id']))
public_network_id = network['id']
public_network_name = network['name']
break
# Couldn't find an existing external network
@ -706,6 +707,8 @@ def create_tempest_networks(clients, conf, has_neutron, public_network_id):
if public_network_id is not None:
conf.set('network', 'public_network_id', public_network_id)
if public_network_name is not None:
conf.set('network', 'floating_network_name', public_network_name)
else:
client = clients.get_nova_net_client()