config.py broke the maximal module size and needs to be refactored. For
this purpose, it will first be moved into a module directory.

Signed-off-by: Aaron Karper <[email protected]>
---
 Makefile.am                           | 7 ++++++-
 lib/{config.py => config/__init__.py} | 0
 2 files changed, 6 insertions(+), 1 deletion(-)
 rename lib/{config.py => config/__init__.py} (100%)

diff --git a/Makefile.am b/Makefile.am
index 8841d73..67df7db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,6 +90,7 @@ tools_pythondir = $(versionedsharedir)
 clientdir = $(pkgpythondir)/client
 cmdlibdir = $(pkgpythondir)/cmdlib
 cmdlib_clusterdir = $(pkgpythondir)/cmdlib/cluster
+configdir = $(pkgpythondir)/config
 hypervisordir = $(pkgpythondir)/hypervisor
 hypervisor_hv_kvmdir = $(pkgpythondir)/hypervisor/hv_kvm
 jqueuedir = $(pkgpythondir)/jqueue
@@ -207,6 +208,7 @@ DIRS = \
        lib/cmdlib \
        lib/cmdlib/cluster \
        lib/confd \
+       lib/config \
        lib/jqueue \
        lib/http \
        lib/hypervisor \
@@ -441,7 +443,6 @@ pkgpython_PYTHON = \
        lib/cli.py \
        lib/cli_opts.py \
        lib/compat.py \
-       lib/config.py \
        lib/constants.py \
        lib/daemon.py \
        lib/errors.py \
@@ -511,6 +512,9 @@ cmdlib_cluster_PYTHON = \
        lib/cmdlib/cluster/__init__.py \
        lib/cmdlib/cluster/verify.py
 
+config_PYTHON = \
+       lib/config/__init__.py
+
 hypervisor_PYTHON = \
        lib/hypervisor/__init__.py \
        lib/hypervisor/hv_base.py \
@@ -1976,6 +1980,7 @@ all_python_code = \
        $(client_PYTHON) \
        $(cmdlib_PYTHON) \
        $(cmdlib_cluster_PYTHON) \
+       $(config_PYTHON) \
        $(hypervisor_PYTHON) \
        $(hypervisor_hv_kvm_PYTHON) \
        $(jqueue_PYTHON) \
diff --git a/lib/config.py b/lib/config/__init__.py
similarity index 100%
rename from lib/config.py
rename to lib/config/__init__.py
-- 
2.1.0.rc2.206.gedb03e5

Reply via email to