Merge "Allow metadata proxy to log with nobody user/group"

diff --cc etc/neutron.conf
Simple merge

diff --cc neutron/agent/common/config.py
Simple merge

diff --cc neutron/agent/linux/utils.py
Simple merge

diff --cc neutron/tests/unit/agent/linux/test_utils.py
index 25e2c0c8f51e1a6fc8d31d2d841682c6501ec828,ff0678ee9cbb9978ba916328def605c69a932544..709a65e0f0c41563d9d6b966164f3dcc8a0376cd
--- 1/neutron/tests/unit/agent/linux/test_utils.py
--- 2/neutron/tests/unit/agent/linux/test_utils.py
+++ b/neutron/tests/unit/agent/linux/test_utils.py
@@@ -198,19 -198,29 +198,30 @@@ class TestPathUtilities(base.BaseTestCa
          self.assertEqual(['ping', '8.8.8.8'],
                           utils.remove_abs_path(['/usr/bin/ping', '8.8.8.8']))
  
 -    def test_cmdlines_are_equal(self):
 -        self.assertTrue(utils.cmdlines_are_equal(
 -            ['ping', '8.8.8.8'],
 -            ['/usr/bin/ping', '8.8.8.8']))
 -
 -    def test_cmdlines_are_equal_different_commands(self):
 -        self.assertFalse(utils.cmdlines_are_equal(
 -            ['ping', '8.8.8.8'],
 -            ['/usr/bin/ping6', '8.8.8.8']))
 +    def test_cmd_matches_expected_matches_abs_path(self):
 +        cmd = ['/bar/../foo']
 +        self.assertTrue(utils.cmd_matches_expected(cmd, cmd))
 +
 +    def test_cmd_matches_expected_matches_script(self):
 +        self.assertTrue(utils.cmd_matches_expected(['python', 'script'],
 +                                                   ['script']))
 +
 +    def test_cmd_matches_expected_doesnt_match(self):
 +        self.assertFalse(utils.cmd_matches_expected('foo', 'bar'))
  
  
+ class FakeUser(object):
+     def __init__(self, name):
+         self.pw_name = name
+ 
+ 
  class TestBaseOSUtils(base.BaseTestCase):
+ 
+     EUID = 123
+     EUNAME = 'user'
+     EGID = 456
+     EGNAME = 'group'
+ 
      @mock.patch.object(os.path, 'isdir', return_value=False)
      @mock.patch.object(os, 'makedirs')
      def test_ensure_dir_not_exist(self, makedirs, isdir):