x
/
fuel-plugin-xenserver
Code Issues Proposed changes

Merge "Fix problem when pub and prv use the same network"

This commit is contained in:
Jenkins 2016-05-11 13:44:30 +00:00 committed by Gerrit Code Review
parent 7395d7461a 2c61d29f58
commit 7bb457fe28
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deployment_scripts/compute_post_deployment.py
View File

@ -345,12 +345,19 @@ def modify_neutron_ovs_agent_conf(int_br, br_mappings):
def get_private_network_ethX():
# find out bridge which is used for private network
# find out ethX in DomU which connect to private network
# br-aux is the auxiliary bridge and in normal case there will be a patch
# between br-prv and br-aux
values = astute['network_scheme']['transformations']
for item in values:
if item['action'] == 'add-port' and item['bridge'] == 'br-aux':
return item['name']
# If cannot find br-aux, the network topo should be public and private
# connect to the same network and "Assign public network to all nodes"
# is checked, we need to use br-ex to find ethX in domU
for item in values:
if item['action'] == 'add-port' and item['bridge'] == 'br-ex':
return item['name']
def find_bridge_mappings(astute, himn, username, password):
ethX = get_private_network_ethX()