openstack/openstack-ansible
Code Issues Proposed changes

Merge "FIX: provider_networks module for multiple vlans"

Browse Source
This commit is contained in:
Jenkins 2015-12-15 09:53:50 +00:00 committed by Gerrit Code Review
commit d89e1f36a2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
playbooks/library/provider_networks
View File

@ -174,12 +174,12 @@ class ProviderNetworksParsing(object):
if net['network']['type'] == "vlan": if net['network']['type'] == "vlan":
if "vlan" not in self.network_types: if "vlan" not in self.network_types:
self.network_types.append('vlan') self.network_types.append('vlan')
for vlan_range in net['network']['range'].split(','): for vlan_range in net['network']['range'].split(','):
self.network_vlan_ranges.append( self.network_vlan_ranges.append(
'%s:%s' % ( '%s:%s' % (
net['network']['net_name'], vlan_range.strip() net['network']['net_name'], vlan_range.strip()
)
) )
)
elif net['network']['type'] == "vxlan": elif net['network']['type'] == "vxlan":
if "vxlan" not in self.network_types: if "vxlan" not in self.network_types:
self.network_types.append('vxlan') self.network_types.append('vxlan')