Merge "Adding floating_network_name to network section"
This commit is contained in:
commit
4a89425f42
|
@ -696,6 +696,7 @@ def create_tempest_networks(clients, conf, has_neutron, public_network_id):
|
||||||
if network['router:external'] and network['subnets']:
|
if network['router:external'] and network['subnets']:
|
||||||
LOG.info("Found network, using: {0}".format(network['id']))
|
LOG.info("Found network, using: {0}".format(network['id']))
|
||||||
public_network_id = network['id']
|
public_network_id = network['id']
|
||||||
|
public_network_name = network['name']
|
||||||
break
|
break
|
||||||
|
|
||||||
# Couldn't find an existing external network
|
# 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:
|
if public_network_id is not None:
|
||||||
conf.set('network', 'public_network_id', public_network_id)
|
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:
|
else:
|
||||||
client = clients.get_nova_net_client()
|
client = clients.get_nova_net_client()
|
||||||
|
|
Loading…
Reference in New Issue