From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: move constants.P_VDSM_NODE_ID to its sole user
......................................................................
move constants.P_VDSM_NODE_ID to its sole user
Change-Id: Iae0a734fa9903d978e6e6ce1a03ce86cbc898e83
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/constants.py.in
M lib/vdsm/host/__init__.py
2 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/79715/1
diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in
index 6be6b57..b6193f6 100644
--- a/lib/vdsm/constants.py.in
+++ b/lib/vdsm/constants.py.in
@@ -79,7 +79,6 @@
P_VDSM_KEYS = '/etc/pki/vdsm/keys/'
P_VDSM_LOG = '@VDSMLOGDIR@' # NOQA: E501 (potentially long line)
-P_VDSM_NODE_ID = '/etc/vdsm/vdsm.id'
P_VDSM_EXEC = '@LIBEXECDIR@' # NOQA: E501 (potentially long line)
diff --git a/lib/vdsm/host/__init__.py b/lib/vdsm/host/__init__.py
index 5bcd572..14e01b8 100644
--- a/lib/vdsm/host/__init__.py
+++ b/lib/vdsm/host/__init__.py
@@ -27,14 +27,16 @@
from vdsm import constants
from vdsm import cpuarch
+P_VDSM_NODE_ID = '/etc/vdsm/vdsm.id'
+
@memoized
def uuid():
host_UUID = None
try:
- if os.path.exists(constants.P_VDSM_NODE_ID):
- with open(constants.P_VDSM_NODE_ID) as f:
+ if os.path.exists(P_VDSM_NODE_ID):
+ with open(P_VDSM_NODE_ID) as f:
host_UUID = f.readline().replace("\n", "")
else:
arch = cpuarch.real()
--
To view, visit
https://gerrit.ovirt.org/79715
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae0a734fa9903d978e6e6ce1a03ce86cbc898e83
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>