From: Salvatore Orlando Date: Mon, 3 Sep 2012 12:43:29 +0000 (-0700) Subject: Fix error in rule for metadata server dnat X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6beb9e079b00b010c2ba756882c619d3c5159e24;p=openstack-build%2Fneutron-build.git Fix error in rule for metadata server dnat Fixes bug 1045312 Change-Id: Ie0e2aa7e638a7cd50c87ae6d4fa807cb7733c3d1 --- diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py index 6e26b7e29..a93bf699c 100644 --- a/quantum/agent/l3_agent.py +++ b/quantum/agent/l3_agent.py @@ -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