Merge "Remove references to 0.0.0.0/0 in iptable rules"

diff --cc neutron/agent/metadata/driver.py
Simple merge

diff --cc neutron/tests/unit/agent/metadata/test_driver.py
index 43fac13f030c8643639b6136dceab59c69e37ab7,de46a785b7842d5b4e940e5fc7e864e51b8617b0..afd97d9c2e83242957d725b61902b48a157d459c
--- 1/neutron/tests/unit/agent/metadata/test_driver.py
--- 2/neutron/tests/unit/agent/metadata/test_driver.py
+++ b/neutron/tests/unit/agent/metadata/test_driver.py
@@@ -30,10 -28,18 +30,10 @@@ from neutron.tests import bas
  _uuid = uuidutils.generate_uuid
  
  
 -class TestMetadataDriver(base.BaseTestCase):
 -
 -    EUID = 123
 -    EGID = 456
 -
 -    def setUp(self):
 -        super(TestMetadataDriver, self).setUp()
 -        cfg.CONF.register_opts(l3_config.OPTS)
 -        cfg.CONF.register_opts(metadata_driver.MetadataDriver.OPTS)
 +class TestMetadataDriverRules(base.BaseTestCase):
  
      def test_metadata_nat_rules(self):
-         rules = ('PREROUTING', '-s 0.0.0.0/0 -d 169.254.169.254/32 '
+         rules = ('PREROUTING', '-d 169.254.169.254/32 '
                   '-p tcp -m tcp --dport 80 -j REDIRECT --to-port 8775')
          self.assertEqual(
              [rules],