Change in vdsm[master]: janitorial: drop once-used P_VDSM_KEYS

[Code Review]

From Dan Kenigsberg :

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 
---
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@/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():

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: janitorial: drop once-used P_VDSM_KEYS
......................................................................

Patch Set 2:

ci please build

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: janitorial: drop once-used P_VDSM_KEYS
......................................................................

Patch Set 2:

http://jenkins.ovirt.org/view/oVirt%20system%20tests/job/ovirt-system-tests_...

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: janitorial: drop once-used P_VDSM_KEYS
......................................................................

Patch Set 2: Code-Review-1 Verified-1

(1 comment)

https://gerrit.ovirt.org/#/c/77468/2/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 150: EXT_KVM_2_OVIRT = '@LIBEXECDIR@/kvm2ovirt'  # NOQA: E501 (potentially long line)
Line 151: EXT_SYSTEMD_RUN = '@SYSTEMD_RUN_PATH@'
Line 152: 
Line 153: # location of the certificates
Line 154: PKI_DIR = os.path.join(SYSCONF_PATH, 'pki', 'vdsm')
nope, PKI_DIR does not have the /keys/ in the end.
Line 155: KEY_FILE = os.path.join(PKI_DIR, 'keys', 'vdsmkey.pem')
Line 156: CERT_FILE = os.path.join(PKI_DIR, 'certs', 'vdsmcert.pem')

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: janitorial: drop once-used P_VDSM_KEYS
......................................................................

Patch Set 2:

(1 comment)

https://gerrit.ovirt.org/#/c/77468/2/lib/vdsm/tool/configurators/passwd.py
File lib/vdsm/tool/configurators/passwd.py:

Line 37: _SASLPASSWD2 = cmdutils.CommandPath("saslpasswd2",
Line 38:                                     "/usr/sbin/saslpasswd2",
Line 39:                                     )
Line 40: SASL_USERNAME = "vdsm@ovirt"
Line 41: LIBVIRT_PASSWORD_PATH = os.path.join(constants.PKI_DIR, 'libvirt_password')
> Why not:

mmmm, this would leak the "keys" element out of constants.py
Line 42: 
Line 43: 
Line 44: def isconfigured():
Line 45:     script = (str(_SASLDBLISTUSERS2), '-f', _LIBVIRT_SASLDB)

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: janitorial: drop once-used P_VDSM_KEYS
......................................................................

Patch Set 2:

(1 comment)

https://gerrit.ovirt.org/#/c/77468/2/lib/vdsm/tool/configurators/passwd.py
File lib/vdsm/tool/configurators/passwd.py:

Line 37: _SASLPASSWD2 = cmdutils.CommandPath("saslpasswd2",
Line 38:                                     "/usr/sbin/saslpasswd2",
Line 39:                                     )
Line 40: SASL_USERNAME = "vdsm@ovirt"
Line 41: LIBVIRT_PASSWORD_PATH = os.path.join(constants.PKI_DIR, 'libvirt_password')
> See pending pki module for imageio:

libvirt_password does not even belong to PKI_DIR (it has nothing to do with public key infrastructure); I don't want to make a fuss of it, so I'll just "leak" the "keys" string.
Line 42: 
Line 43: 
Line 44: def isconfigured():
Line 45:     script = (str(_SASLDBLISTUSERS2), '-f', _LIBVIRT_SASLDB)

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: janitorial: drop once-used P_VDSM_KEYS
......................................................................

Patch Set 4: Verified+1

OST passes http://jenkins.ovirt.org/view/oVirt%20system%20tests/job/ovirt-system-tests_...

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/77468 )

Change subject: janitorial: drop once-used P_VDSM_KEYS
......................................................................

janitorial: drop once-used P_VDSM_KEYS

PKI_DIR leads to basically the same place.

Change-Id: I588a94534d2813bc9ffdd1688364cea0e7516170
Signed-off-by: Dan Kenigsberg 
---
M lib/vdsm/constants.py.in
M lib/vdsm/tool/configurators/passwd.py
2 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Piotr Kliczewski: Looks good to me, approved
  Nir Soffer: Looks good to me, but someone else must approve
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Verified