← Back to branch summary

~blamar/nova/libvirt-cleanup-branch

« back to all changes in this revision

Viewing changes to nova/virt/libvirt/firewall.py

  • Committer: Brian Lamar
  • Date: 2011-07-01 16:07:15 UTC
  • mfrom: (1217.1.27 nova)
  • Revision ID: brian.lamar@rackspace.com-20110701160715-b5prxtlcfz2qotjx
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/libvirt/firewall.py
616
616
        ipv4_rules += ['-j $provider']
617
617
        ipv6_rules += ['-j $provider']
618
618
 
619
 
        dhcp_servers = [network['gateway'] for (network, _m) in network_info]
 
619
        dhcp_servers = [info['gateway'] for (_n, info) in network_info]
620
620
 
621
621
        for dhcp_server in dhcp_servers:
622
622
            ipv4_rules.append('-s %s -p udp --sport 67 --dport 68 '
633
633
        # they're not worth the clutter.
634
634
        if FLAGS.use_ipv6:
635
635
            # Allow RA responses
636
 
            gateways_v6 = [network['gateway_v6'] for (network, _m) in
 
636
            gateways_v6 = [mapping['gateway6'] for (_n, mapping) in
637
637
                           network_info]
638
638
            for gateway_v6 in gateways_v6:
639
639
                ipv6_rules.append(
641
641
 
642
642
            #Allow project network traffic
643
643
            if FLAGS.allow_project_net_traffic:
644
 
                cidrv6s = [network['cidr_v6'] for (network, _m)
645
 
                          in network_info]
 
644
                cidrv6s = [network['cidr_v6'] for (network, _m) in
 
645
                           network_info]
646
646
 
647
647
                for cidrv6 in cidrv6s:
648
648
                    ipv6_rules.append('-s %s -j ACCEPT' % (cidrv6,))