Change in vdsm[master]: move constants.P_VDSM_CONF to vdsm.config

[Code Review]

From Dan Kenigsberg <danken(a)redhat.com&gt;:

Dan Kenigsberg has uploaded a new change for review.

Change subject: move constants.P_VDSM_CONF to vdsm.config
......................................................................

move constants.P_VDSM_CONF to vdsm.config

Change-Id: Ic0ba7de6aae8331a3587d82eadf16346437cafb6
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M lib/vdsm/config.py.in
M lib/vdsm/constants.py.in
M lib/vdsm/vdsmd.py
3 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/79742/1

diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in
index d7b4cfc..06245a4 100644
--- a/lib/vdsm/config.py.in
+++ b/lib/vdsm/config.py.in
@@ -43,8 +43,8 @@
 import textwrap
 import glob
 
-_SYSCONFDIR = '@sysconfdir@'
-_DROPPIN_BASES = ("/usr/lib/", "/run/", _SYSCONFDIR)
+P_VDSM_CONF = '@sysconfdir@'
+_DROPPIN_BASES = ("/usr/lib/", "/run/", P_VDSM_CONF)
 
 
 parameters = [
@@ -617,7 +617,7 @@
     or users can overwrite the defaults, by placing a complete or partial
     configuration file into /etc or a drop-in directory.
     """
-    default_conf = os.path.join(_SYSCONFDIR, name, name + '.conf')
+    default_conf = os.path.join(P_VDSM_CONF, name, name + '.conf')
     cfg.read(default_conf)
 
     dropins = []
diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in
index 66c669b..72d4a67 100644
--- a/lib/vdsm/constants.py.in
+++ b/lib/vdsm/constants.py.in
@@ -63,7 +63,6 @@
 P_VDSM_HOOKS = '@HOOKSDIR@/'  # NOQA: E501 (potentially long line)
 P_VDSM_LIB = '@VDSMLIBDIR@/'  # NOQA: E501 (potentially long line)
 P_VDSM_RUN = '@VDSMRUNDIR@/'  # NOQA: E501 (potentially long line)
-P_VDSM_CONF = '@CONFDIR@/'  # NOQA: E501 (potentially long line)
 
 P_VDSM_LOG = '@VDSMLOGDIR@'  # NOQA: E501 (potentially long line)
 
diff --git a/lib/vdsm/vdsmd.py b/lib/vdsm/vdsmd.py
index ee734bc..75049e1 100755
--- a/lib/vdsm/vdsmd.py
+++ b/lib/vdsm/vdsmd.py
@@ -50,7 +50,7 @@
 from vdsm.virt import periodic
 
 
-loggerConfFile = constants.P_VDSM_CONF + 'logger.conf'
+loggerConfFile = os.path.join(config.P_VDSM_CONF, 'logger.conf')
 
 
 class FatalError(Exception):


-- 
To view, visit https://gerrit.ovirt.org/79742
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0ba7de6aae8331a3587d82eadf16346437cafb6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com&gt;