← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/virt/firewall.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/firewall.py
332
332
                    fw_rules = ipv6_rules
333
333
 
334
334
                protocol = rule.protocol
335
 
                if version == 6 and rule.protocol == 'icmp':
 
335
 
 
336
                if protocol:
 
337
                    protocol = rule.protocol.lower()
 
338
 
 
339
                if version == 6 and protocol == 'icmp':
336
340
                    protocol = 'icmpv6'
337
341
 
338
342
                args = ['-j ACCEPT']