]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Fix error in rule for metadata server dnat
authorSalvatore Orlando <salv.orlando@gmail.com>
Mon, 3 Sep 2012 12:43:29 +0000 (05:43 -0700)
committerSalvatore Orlando <salv.orlando@gmail.com>
Mon, 3 Sep 2012 12:49:57 +0000 (05:49 -0700)
Fixes bug 1045312

Change-Id: Ie0e2aa7e638a7cd50c87ae6d4fa807cb7733c3d1

quantum/agent/l3_agent.py

index 6e26b7e29bfe9696b7c7cc6275dc16debd4ca44c..a93bf699cf6140aca0dd25cd1a6d5701d74a5579 100644 (file)
@@ -361,10 +361,10 @@ class L3NATAgent(object):
                   '! -o %(interface_name)s -m conntrack ! '
                   '--ctstate DNAT -j ACCEPT' % locals())]
         if self.conf.metadata_ip:
-            rules.append('PREROUTING', '-s 0.0.0.0/0 -d 169.254.169.254/32 '
+            rules.append(('PREROUTING', '-s 0.0.0.0/0 -d 169.254.169.254/32 '
                          '-p tcp -m tcp --dport 80 -j DNAT '
                          '--to-destination %s:%s' %
-                         (self.conf.metadata_ip, self.conf.metadata_port))
+                         (self.conf.metadata_ip, self.conf.metadata_port)))
         for cidr in internal_cidrs:
             rules.extend(self.internal_network_nat_rules(ex_gw_ip, cidr))
         return rules