From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: janitorial: drop once-used P_VDSM_KEYS
......................................................................
janitorial: drop once-used P_VDSM_KEYS
We have another name for the same constant, PKI_DIR.
Change-Id: I588a94534d2813bc9ffdd1688364cea0e7516170
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/constants.py.in
M lib/vdsm/tool/configurators/passwd.py
2 files changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/77468/1
diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in
index 7c0d209..1891a49 100644
--- a/lib/vdsm/constants.py.in
+++ b/lib/vdsm/constants.py.in
@@ -82,7 +82,6 @@
P_VDSM_RUN = '@VDSMRUNDIR@/' # NOQA: E501 (potentially long line)
P_VDSM_STORAGE = os.path.join(P_VDSM_RUN, 'storage/')
P_VDSM_CONF = '@CONFDIR@/' # NOQA: E501 (potentially long line)
-P_VDSM_KEYS = '/etc/pki/vdsm/keys/'
P_VDSM_CLIENT_LOG = '@VDSMRUNDIR(a)/client.log' # NOQA: E501 (potentially long
line)
P_VDSM_LOG = '@VDSMLOGDIR@' # NOQA: E501 (potentially long line)
diff --git a/lib/vdsm/tool/configurators/passwd.py
b/lib/vdsm/tool/configurators/passwd.py
index 9a3b793..fe62860 100644
--- a/lib/vdsm/tool/configurators/passwd.py
+++ b/lib/vdsm/tool/configurators/passwd.py
@@ -35,7 +35,7 @@
"/usr/sbin/saslpasswd2",
)
SASL_USERNAME = "vdsm@ovirt"
-LIBVIRT_PASSWORD_PATH = constants.P_VDSM_KEYS + 'libvirt_password'
+LIBVIRT_PASSWORD_PATH = constants.PKI_DIR + 'libvirt_password'
def isconfigured():
--
To view, visit
https://gerrit.ovirt.org/77468
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I588a94534d2813bc9ffdd1688364cea0e7516170
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>