← Back to branch summary

~openstack-charmers/charms/precise/quantum-gateway/trunk

« back to all changes in this revision

Viewing changes to hooks/quantum_contexts.py

  • Committer: Edward Hope-Morley
  • Date: 2015-04-10 16:25:56 UTC
  • mfrom: (96.1.1 quantum-gateway)
  • Revision ID: edward.hope-morley@canonical.com-20150410162556-wtl111ng2nycexo2
[hopem,r=wolsen] fix ml2 config

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/quantum_contexts.py
144
144
 
145
145
        mappings = config('bridge-mappings')
146
146
        if mappings:
147
 
            ctxt['bridge_mappings'] = mappings
 
147
            ctxt['bridge_mappings'] = ','.join(mappings.split())
148
148
 
149
149
        vlan_ranges = config('vlan-ranges')
150
150
        vlan_range_mappings = parse_vlan_range_mappings(vlan_ranges)
151
151
        if vlan_range_mappings:
152
152
            providers = sorted(vlan_range_mappings.keys())
153
 
            ctxt['network_providers'] = ' '.join(providers)
154
 
            ctxt['vlan_ranges'] = vlan_ranges
 
153
            ctxt['network_providers'] = ','.join(providers)
 
154
            ctxt['vlan_ranges'] = ','.join(vlan_ranges.split())
155
155
 
156
156
        net_dev_mtu = api_settings['network_device_mtu']
157
157
        if net_dev_mtu: