← Back to branch summary

~corey.bryant/charms/trusty/neutron-gateway/git-1531612

« back to all changes in this revision

Viewing changes to hooks/neutron_utils.py

  • Committer: Liam Young
  • Date: 2015-09-30 06:56:48 UTC
  • mfrom: (147.1.2 neutron-gateway.next)
  • Revision ID: liam.young@canonical.com-20150930065648-mw1g151z2htouekj
[hopem,r=gnuoy] Sync charmhelpers to get fix for LP 1500386

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/neutron_utils.py
751
751
        bridgemaps = parse_bridge_mappings(config('bridge-mappings'))
752
752
        for provider, br in bridgemaps.iteritems():
753
753
            add_bridge(br)
754
 
 
755
 
            if not portmaps or br not in portmaps:
 
754
            if not portmaps:
756
755
                continue
757
756
 
758
 
            add_bridge_port(br, portmaps[br], promisc=True)
 
757
            for port, _br in portmaps.iteritems():
 
758
                if _br == br:
 
759
                    add_bridge_port(br, port, promisc=True)
759
760
 
760
761
        # Ensure this runs so that mtu is applied to data-port interfaces if
761
762
        # provided.