Browse Source

Move config options to networking_dpm.conf

This patch moves the config option definition to networking_dpm.conf.
This is the same directory like used in nova. A separate directory
is required anyhow to have a place for custom oslo config types and
opts.

Change-Id: Ie0424c2287fcda1e90b1edb733d0d95245497e38
Partial-Bug: #1663369
Andreas Scheuring 2 years ago
parent
commit
fe8bc65fa6

+ 0
- 0
networking_dpm/conf/__init__.py View File


networking_dpm/ml2/config.py → networking_dpm/conf/config.py View File


+ 1
- 1
networking_dpm/ml2/dpm_neutron_agent.py View File

@@ -23,7 +23,7 @@ import oslo_messaging
23 23
 from oslo_service import service
24 24
 import zhmcclient
25 25
 
26
-from networking_dpm.ml2 import config
26
+from networking_dpm.conf import config
27 27
 from networking_dpm.ml2 import constants as const
28 28
 from networking_dpm.ml2.mech_dpm import AGENT_TYPE_DPM
29 29
 

+ 0
- 0
networking_dpm/tests/unit/conf/__init__.py View File


networking_dpm/tests/unit/ml2/test_config.py → networking_dpm/tests/unit/conf/test_config.py View File

@@ -17,10 +17,10 @@
17 17
 from os_dpm.config import config as os_dpm_conf
18 18
 from oslo_config import cfg
19 19
 
20
-from networking_dpm.ml2 import config
21
-
22 20
 from neutron.tests import base
23 21
 
22
+from networking_dpm.conf import config
23
+
24 24
 
25 25
 class TestConfig(base.BaseTestCase):
26 26
     def test_config(self):

+ 1
- 1
setup.cfg View File

@@ -55,7 +55,7 @@ source-dir = releasenotes/source
55 55
 console_scripts =
56 56
     neutron-dpm-agent = networking_dpm.cmd.eventlet.dpm_neutron_agent:main
57 57
 oslo.config.opts =
58
-    networking_dpm = networking_dpm.ml2.config:list_opts
58
+    networking_dpm = networking_dpm.conf.config:list_opts
59 59
 neutron.ml2.mechanism_drivers =
60 60
     dpm = networking_dpm.ml2.mech_dpm:DPMMechanismDriver
61 61
 

Loading…
Cancel
Save