File 0001-Skip-reading-config-files-from-neutron.conf.d-for-th.patch of Package openstack-neutron

From dc59db0827df51a04ec084bff5106b45ae9da3d9 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Wed, 1 Feb 2017 23:05:48 +0100
Subject: [PATCH] Skip reading config files from neutron.conf.d for the
 namespace proxy

The namespace proxy should only be handling config options passed in
via commandline. For that it had an overwrite to skp the default config
file, but it didn't skp the default config dir, which could as well
contain config files that were read.

Change-Id: Id2dffe6f53afbfd48128d91c5d807be8785534eb
Closes-Bug: #1661106
---
 neutron/agent/metadata/namespace_proxy.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: neutron-9.4.1.dev88/neutron/agent/metadata/namespace_proxy.py
===================================================================
--- neutron-9.4.1.dev88.orig/neutron/agent/metadata/namespace_proxy.py
+++ neutron-9.4.1.dev88/neutron/agent/metadata/namespace_proxy.py
@@ -177,8 +177,9 @@ def main():
     ]
 
     cfg.CONF.register_cli_opts(opts)
-    # Don't get the default configuration file
-    cfg.CONF(project='neutron', default_config_files=[])
+    # Don't read any default configuration file,  just handle cmdline opts
+    cfg.CONF(project='neutron',
+             default_config_files=[], default_config_dirs=[])
     config.setup_logging()
     utils.log_opt_values(LOG)
 
openSUSE Build Service is sponsored by