Change in vdsm[master]: utils: build cert paths in single place

2016-10-31 Thread danken 
Dan Kenigsberg has submitted this change and it was merged.

Change subject: utils: build cert paths in single place
..


utils: build cert paths in single place

We make sure that all the references to certificates location are in
single place. As part of this fix we remove trust store path from
configuration which is not needed anymore.

Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Signed-off-by: pkliczewski 
Reviewed-on: https://gerrit.ovirt.org/52354
Continuous-Integration: Jenkins CI
Reviewed-by: Yaniv Bronhaim 
Tested-by: Irit Goihman 
Reviewed-by: Dan Kenigsberg 
---
M build-aux/Makefile.subs
M lib/vdsm/config.py.in
M lib/vdsm/constants.py.in
M lib/vdsm/m2cutils.py
M lib/vdsm/sslutils.py
M lib/vdsm/tool/configurators/certificates.py
M lib/vdsm/tool/configurators/libvirt.py
M lib/vdsm/vdscli.py
M vdsm/sos/vdsm.py.in
9 files changed, 26 insertions(+), 42 deletions(-)

Approvals:
  Yaniv Bronhaim: Looks good to me, but someone else must approve
  Jenkins CI: Passed CI tests
  Irit Goihman: Verified
  Dan Kenigsberg: Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 15
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-10-31 Thread danken 
Dan Kenigsberg has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 14: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 14
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-10-31 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 15:

* update_tracker: OK
* Set MODIFIED::IGNORE, no Bug-Url found.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 15
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-10-31 Thread igoihman 
Irit Goihman has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 14: Verified+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 14
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-10-31 Thread danken 
Dan Kenigsberg has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 13:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/13/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 154: EXT_KVM_2_OVIRT = '@LIBEXECDIR@/kvm2ovirt'
Line 155: EXT_SYSTEMD_RUN = '@SYSTEMD_RUN_PATH@'
Line 156: 
Line 157: # location of the certificates
Line 158: PKI_DIR = os.path.join(SYSCONF_PATH, 'pki', 'vdsm')
> Puting all constants in single module is not junkyard, this is a good way t
constants that do not have a "natural" owner should in this junkyard. But I was 
suspecting that this particular constant (and many others) can sit in a module 
that should be important anyway in order to use them.

However, I see that Irit says this is not possible, so I'm dropping my -1 (but 
expecting a better explanation WHY this is impossible).
Line 159: KEY_FILE = os.path.join(PKI_DIR, 'keys', 'vdsmkey.pem')
Line 160: CERT_FILE = os.path.join(PKI_DIR, 'certs', 'vdsmcert.pem')


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-10-31 Thread danken 
Dan Kenigsberg has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 14: -Code-Review

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 14
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-10-30 Thread ybronhei 
Yaniv Bronhaim has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 14: Code-Review+1

lets monitor the sos paths collection in separate bugzilla and add it after 
splitting the constant module (other bugzilla to monitor. please open the two)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 14
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-26 Thread fromani 
Francesco Romani has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 13:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/13/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 154: EXT_KVM_2_OVIRT = '@LIBEXECDIR@/kvm2ovirt'
Line 155: EXT_SYSTEMD_RUN = '@SYSTEMD_RUN_PATH@'
Line 156: 
Line 157: # location of the certificates
Line 158: PKI_DIR = os.path.join(SYSCONF_PATH, 'pki', 'vdsm')
> Puting all constants in single module is not junkyard, this is a good way t
One module of constants per vertical looks like a good compromise, let's do 
that in a new topic branch
Line 159: KEY_FILE = os.path.join(PKI_DIR, 'keys', 'vdsmkey.pem')
Line 160: CERT_FILE = os.path.join(PKI_DIR, 'certs', 'vdsmcert.pem')


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-26 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 13:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/13/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 154: EXT_KVM_2_OVIRT = '@LIBEXECDIR@/kvm2ovirt'
Line 155: EXT_SYSTEMD_RUN = '@SYSTEMD_RUN_PATH@'
Line 156: 
Line 157: # location of the certificates
Line 158: PKI_DIR = os.path.join(SYSCONF_PATH, 'pki', 'vdsm')
> I'm sorry to tell you guys that this is not possible, it's causing circular
Puting all constants in single module is not junkyard, this is a good way to 
share constants in multiple modules without creating circular dependencies.

If you want to limit the junk, create constants module for each package 
(common, network, virt, storage).
Line 159: KEY_FILE = os.path.join(PKI_DIR, 'keys', 'vdsmkey.pem')
Line 160: CERT_FILE = os.path.join(PKI_DIR, 'certs', 'vdsmcert.pem')


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-26 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 14:

* update_tracker: OK
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-4.0'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 14
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-26 Thread igoihman 
Irit Goihman has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 13:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/13/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 154: EXT_KVM_2_OVIRT = '@LIBEXECDIR@/kvm2ovirt'
Line 155: EXT_SYSTEMD_RUN = '@SYSTEMD_RUN_PATH@'
Line 156: 
Line 157: # location of the certificates
Line 158: PKI_DIR = os.path.join(SYSCONF_PATH, 'pki', 'vdsm')
> Good idea, let's do it
I'm sorry to tell you guys that this is not possible, it's causing circular 
imports. we'll have to keep it here...
Line 159: KEY_FILE = os.path.join(PKI_DIR, 'keys', 'vdsmkey.pem')
Line 160: CERT_FILE = os.path.join(PKI_DIR, 'certs', 'vdsmcert.pem')


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-26 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 13:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/13/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 154: EXT_KVM_2_OVIRT = '@LIBEXECDIR@/kvm2ovirt'
Line 155: EXT_SYSTEMD_RUN = '@SYSTEMD_RUN_PATH@'
Line 156: 
Line 157: # location of the certificates
Line 158: PKI_DIR = os.path.join(SYSCONF_PATH, 'pki', 'vdsm')
> I just hate this constants.py junkyard.
Good idea, let's do it
Line 159: KEY_FILE = os.path.join(PKI_DIR, 'keys', 'vdsmkey.pem')
Line 160: CERT_FILE = os.path.join(PKI_DIR, 'certs', 'vdsmcert.pem')


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-25 Thread danken 
Dan Kenigsberg has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 13:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/13/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 154: EXT_KVM_2_OVIRT = '@LIBEXECDIR@/kvm2ovirt'
Line 155: EXT_SYSTEMD_RUN = '@SYSTEMD_RUN_PATH@'
Line 156: 
Line 157: # location of the certificates
Line 158: PKI_DIR = os.path.join(SYSCONF_PATH, 'pki', 'vdsm')
I just hate this constants.py junkyard.

How about placing the new constants in sslcompat, or somewhere else where they 
belong? If it's impossible due to circular imports, I suppose we'd end up in 
the generic junkyard.
Line 159: KEY_FILE = os.path.join(PKI_DIR, 'keys', 'vdsmkey.pem')
Line 160: CERT_FILE = os.path.join(PKI_DIR, 'certs', 'vdsmcert.pem')


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-25 Thread igoihman 
Irit Goihman has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 13: Verified+1

no errors in vdsm, created a new vm and sos report shows the wanted data

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-22 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 13: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-22 Thread igoihman 
Irit Goihman has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 13:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/12/vdsm/sos/vdsm.py.in
File vdsm/sos/vdsm.py.in:

Line 104: self.addCopySpec("/tmp/vds_bootstrap*")
Line 105: self.addCopySpec("/etc/vdsm/*")
Line 106: logsize = self.getOption('logsize')
Line 107: self.__addCopySpecLogLimit("/var/log/vdsm/*", logsize)
Line 108: self._addVdsmRunDir()
> I'm working on a change now, I only rebased the patch and didn't refer the 
Done
Line 109: self.addCopySpec("/etc/pki/vdsm")
Line 110: self.addCopySpec("@HOOKSDIR@")
Line 111: self.addCopySpec("@VDSMLIBDIR@")
Line 112: self.addCopySpec("/var/log/ovirt.log")


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-22 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 13:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-4.0'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-22 Thread igoihman 
Irit Goihman has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 12:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/12/vdsm/sos/vdsm.py.in
File vdsm/sos/vdsm.py.in:

Line 104: self.addCopySpec("/tmp/vds_bootstrap*")
Line 105: self.addCopySpec("/etc/vdsm/*")
Line 106: logsize = self.getOption('logsize')
Line 107: self.__addCopySpecLogLimit("/var/log/vdsm/*", logsize)
Line 108: self._addVdsmRunDir()
> key is still not collected. is it intentional?
I'm working on a change now, I only rebased the patch and didn't refer the 
comments.
Line 109: self.addCopySpec("@HOOKSDIR@")
Line 110: self.addCopySpec("@VDSMLIBDIR@")
Line 111: self.addCopySpec("/var/log/ovirt.log")
Line 112: self.addCopySpec("/var/log/sanlock.log")


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-22 Thread danken 
Dan Kenigsberg has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 12: Code-Review-1

(1 comment)

-1 for visibility

https://gerrit.ovirt.org/#/c/52354/12/vdsm/sos/vdsm.py.in
File vdsm/sos/vdsm.py.in:

Line 104: self.addCopySpec("/tmp/vds_bootstrap*")
Line 105: self.addCopySpec("/etc/vdsm/*")
Line 106: logsize = self.getOption('logsize')
Line 107: self.__addCopySpecLogLimit("/var/log/vdsm/*", logsize)
Line 108: self._addVdsmRunDir()
key is still not collected. is it intentional?
Line 109: self.addCopySpec("@HOOKSDIR@")
Line 110: self.addCopySpec("@VDSMLIBDIR@")
Line 111: self.addCopySpec("/var/log/ovirt.log")
Line 112: self.addCopySpec("/var/log/sanlock.log")


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-22 Thread igoihman 
Irit Goihman has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 12:

I rebased the patch, please verify the changes

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-22 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 12:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-4.0'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-09-22 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 11:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/11/vdsm/sos/vdsm.py.in
File vdsm/sos/vdsm.py.in:

Line 84: self.addCopySpec("/etc/vdsm-reg/*")
Line 85: logsize = self.getOption('logsize')
Line 86: self.__addCopySpecLogLimit("/var/log/vdsm/*", logsize)
Line 87: self.__addCopySpecLogLimit("/var/log/vdsm-reg/*", logsize)
Line 88: self._addVdsmRunDir()
> I share Nir's worry - I think we should keep collecting the key directory.
Will check
Line 89: self.addCopySpec("@HOOKSDIR@")
Line 90: self.addCopySpec("@VDSMLIBDIR@")
Line 91: self.addCopySpec("/var/log/ovirt.log")
Line 92: self.addCopySpec("/var/log/sanlock.log")


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-19 Thread danken 
Dan Kenigsberg has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 11: Code-Review-1

(1 comment)

https://gerrit.ovirt.org/#/c/52354/11/vdsm/sos/vdsm.py.in
File vdsm/sos/vdsm.py.in:

Line 84: self.addCopySpec("/etc/vdsm-reg/*")
Line 85: logsize = self.getOption('logsize')
Line 86: self.__addCopySpecLogLimit("/var/log/vdsm/*", logsize)
Line 87: self.__addCopySpecLogLimit("/var/log/vdsm-reg/*", logsize)
Line 88: self._addVdsmRunDir()
I share Nir's worry - I think we should keep collecting the key directory.
Line 89: self.addCopySpec("@HOOKSDIR@")
Line 90: self.addCopySpec("@VDSMLIBDIR@")
Line 91: self.addCopySpec("/var/log/ovirt.log")
Line 92: self.addCopySpec("/var/log/sanlock.log")


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-09 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 11:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/11/vdsm/sos/vdsm.py.in
File vdsm/sos/vdsm.py.in:

Line 85
Line 86
Line 87
Line 88
Line 89
Don't we need to replace this with constants.PKI_DIR?

Can you explain why this is not needed now?


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-06 Thread fromani 
Francesco Romani has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 11: Code-Review+1

nice improvement.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-06 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 11: Verified+1

Verified by updating vdsm and checking that communication works. One vm was 
started to check basic functionality.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-06 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 11:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-4.0'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-06 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 10:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/10/build-aux/Makefile.subs
File build-aux/Makefile.subs:

Line 28
Line 29
Line 30
Line 31
Line 32
> Will remove
TRUSTEDSTORE was not used in configure.ac and we can remove vdsmtsdir due to:

Directory not found: 
/home/pkliczewski/rpmbuild/BUILDROOT/vdsm-4.18.999-216.gitcf17c8b.fc23.x86_64/etc/pki/vdsm
Directory not found: 
/home/pkliczewski/rpmbuild/BUILDROOT/vdsm-4.18.999-216.gitcf17c8b.fc23.x86_64/etc/pki/vdsm/keys
Directory not found: 
/home/pkliczewski/rpmbuild/BUILDROOT/vdsm-4.18.999-216.gitcf17c8b.fc23.x86_64/etc/pki/vdsm/certs
Directory not found: 
/home/pkliczewski/rpmbuild/BUILDROOT/vdsm-4.18.999-216.gitcf17c8b.fc23.x86_64/etc/pki/vdsm/libvirt-spice
File not found: 
/home/pkliczewski/rpmbuild/BUILDROOT/vdsm-4.18.999-216.gitcf17c8b.fc23.x86_64/etc/pki/vdsm/keys/libvirt_password

we use it to prepare distribution directories.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-06 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 10:

(4 comments)

https://gerrit.ovirt.org/#/c/52354/10//COMMIT_MSG
Commit Message:

Line 4: Commit: Piotr Kliczewski 
Line 5: CommitDate: 2016-07-05 16:08:19 +0200
Line 6: 
Line 7: utils: build cert paths in single place
Line 8: 
> Please describe the behavior change - we don't use the trusted store config
Done
Line 9: 
Line 10: Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b


https://gerrit.ovirt.org/#/c/52354/10/build-aux/Makefile.subs
File build-aux/Makefile.subs:

Line 28
Line 29
Line 30
Line 31
Line 32
> We probably need to remove vdsmtsdir (and TRUSTEDSTORE?) from configure.ac
Will remove


https://gerrit.ovirt.org/#/c/52354/10/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 154: EXT_KVM_2_OVIRT = '@LIBEXECDIR@/kvm2ovirt'
Line 155: EXT_SYSTEMD_RUN = '@SYSTEMD_RUN_PATH@'
Line 156: 
Line 157: # location of the certificates
Line 158: PKI_DIR = os.path.join(SYSCONF_PATH, 'pki/vdsm')
> Use:
Done
Line 159: KEY_FILE = os.path.join(PKI_DIR, 'keys', 'vdsmkey.pem')
Line 160: CERT_FILE = os.path.join(PKI_DIR, 'certs', 'vdsmcert.pem')


https://gerrit.ovirt.org/#/c/52354/10/lib/vdsm/tool/configurators/libvirt.py
File lib/vdsm/tool/configurators/libvirt.py:

Line 28: from vdsm.tool.configfile import ConfigFile, ParserWrapper
Line 29: from vdsm.tool.validate_ovirt_certs import validate_ovirt_certs
Line 30: from vdsm import utils
Line 31: from vdsm import constants
Line 32: 
> Unrelated
Done
Line 33: 
Line 34: if utils.isOvirtNode():
Line 35: from ovirt.node.utils.fs import Config as NodeCfg
Line 36: 


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-05 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 10:

(4 comments)

Looks mostly good

https://gerrit.ovirt.org/#/c/52354/10//COMMIT_MSG
Commit Message:

Line 4: Commit: Piotr Kliczewski 
Line 5: CommitDate: 2016-07-05 16:08:19 +0200
Line 6: 
Line 7: utils: build cert paths in single place
Line 8: 
Please describe the behavior change - we don't use the trusted store 
configuration option any more.
Line 9: 
Line 10: Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b


https://gerrit.ovirt.org/#/c/52354/10/build-aux/Makefile.subs
File build-aux/Makefile.subs:

Line 28
Line 29
Line 30
Line 31
Line 32
We probably need to remove vdsmtsdir (and TRUSTEDSTORE?) from configure.ac


https://gerrit.ovirt.org/#/c/52354/10/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 154: EXT_KVM_2_OVIRT = '@LIBEXECDIR@/kvm2ovirt'
Line 155: EXT_SYSTEMD_RUN = '@SYSTEMD_RUN_PATH@'
Line 156: 
Line 157: # location of the certificates
Line 158: PKI_DIR = os.path.join(SYSCONF_PATH, 'pki/vdsm')
Use:

os.path.join(SYSCONF_PATH, "pki", "vdsm")
Line 159: KEY_FILE = os.path.join(PKI_DIR, 'keys', 'vdsmkey.pem')
Line 160: CERT_FILE = os.path.join(PKI_DIR, 'certs', 'vdsmcert.pem')


https://gerrit.ovirt.org/#/c/52354/10/lib/vdsm/tool/configurators/libvirt.py
File lib/vdsm/tool/configurators/libvirt.py:

Line 28: from vdsm.tool.configfile import ConfigFile, ParserWrapper
Line 29: from vdsm.tool.validate_ovirt_certs import validate_ovirt_certs
Line 30: from vdsm import utils
Line 31: from vdsm import constants
Line 32: 
Unrelated
Line 33: 
Line 34: if utils.isOvirtNode():
Line 35: from ovirt.node.utils.fs import Config as NodeCfg
Line 36: 


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-05 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 10: Verified+1

Verified by updating vdsm and starting new vm.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-05 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 10:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-4.0'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-05 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 8:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-4.0'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-05 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 7:

(2 comments)

https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 157: # localtion of the certificates
Line 158: def get_cert_paths(path):
Line 159: return (os.path.join(path, 'keys', 'vdsmkey.pem'),
Line 160: os.path.join(path, 'certs', 'vdsmcert.pem'),
Line 161: os.path.join(path, 'certs', 'cacert.pem'))
> I don't understand your answe, Piotr.
Sorry for not being clear. Will make them constant


https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/vdscli.py
File lib/vdsm/vdscli.py:

Line 103
Line 104
Line 105
Line 106
Line 107
> this library is for the client side. A client may want to connect to variou
Correct, I will revert this change.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-05 Thread danken 
Dan Kenigsberg has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 7:

(2 comments)

(very partial review)

https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 157: # localtion of the certificates
Line 158: def get_cert_paths(path):
Line 159: return (os.path.join(path, 'keys', 'vdsmkey.pem'),
Line 160: os.path.join(path, 'certs', 'vdsmcert.pem'),
Line 161: os.path.join(path, 'certs', 'cacert.pem'))
> We need it.
I don't understand your answe, Piotr.


https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/vdscli.py
File lib/vdsm/vdscli.py:

Line 103
Line 104
Line 105
Line 106
Line 107
> Additionally, ovirt-imageio-daemon is using the /etc/pki/vdsm/ - we cannot 
this library is for the client side. A client may want to connect to various 
clusters, each with a different certificate.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-01 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 7:

OK, let me check hard coding the path. It should simplify bunch of code we have.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-01 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 7:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/vdscli.py
File lib/vdsm/vdscli.py:

Line 103
Line 104
Line 105
Line 106
Line 107
> We are already hard coding this value in tool.certificates.PKI_DIR, so this
Additionally, ovirt-imageio-daemon is using the /etc/pki/vdsm/ - we cannot 
support configurable settings here. If you change this value, you break image 
upload and download in 4.0.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Yedidyah Bar David 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-01 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 7:

(2 comments)

https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/sslutils.py
File lib/vdsm/sslutils.py:

Line 263: 
Line 264: def create_ssl_context():
Line 265: sslctx = None
Line 266: if config.getboolean('vars', 'ssl'):
Line 267: path = config.get('vars', 'trust_store_path')
> As you can see here we are using it. Do you suggest to hard code this value
It is already hard coded in certificates.py and in libvirt.py (via import). Can 
you explain how this path will work with the hard coded values?
Line 268: protocol = (
Line 269: ssl.PROTOCOL_SSLv23
Line 270: if config.get('vars', 'ssl_protocol') == 'sslv23'
Line 271: else ssl.PROTOCOL_TLSv1


https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/vdscli.py
File lib/vdsm/vdscli.py:

Line 103
Line 104
Line 105
Line 106
Line 107
> In this code we need it. We would need to explore whether we could hard cod
We are already hard coding this value in tool.certificates.PKI_DIR, so this 
means that the current code does not support dynamic pki dir.

Your patch is not a refactoring but adding features that we don't need. I don't 
want to maintain features that nobody asked for. When we find broken feature 
that is not needed we remove it.

If you think this feature is needed and the fact that it does not work is a 
bug, open a bug.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-01 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 7:

(4 comments)

https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 157: # localtion of the certificates
Line 158: def get_cert_paths(path):
Line 159: return (os.path.join(path, 'keys', 'vdsmkey.pem'),
Line 160: os.path.join(path, 'certs', 'vdsmcert.pem'),
Line 161: os.path.join(path, 'certs', 'cacert.pem'))
> This module is for constants, not for functions.
We need it.


https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/sslutils.py
File lib/vdsm/sslutils.py:

Line 263: 
Line 264: def create_ssl_context():
Line 265: sslctx = None
Line 266: if config.getboolean('vars', 'ssl'):
Line 267: path = config.get('vars', 'trust_store_path')
> We can remove this configuration, it does not work anyway - all the code us
As you can see here we are using it. Do you suggest to hard code this value?
Line 268: protocol = (
Line 269: ssl.PROTOCOL_SSLv23
Line 270: if config.get('vars', 'ssl_protocol') == 'sslv23'
Line 271: else ssl.PROTOCOL_TLSv1


https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/tool/configurators/certificates.py
File lib/vdsm/tool/configurators/certificates.py:

Line 30
Line 31
Line 32
Line 33
Line 34
> Please move  the 4 lines above to constants, and use constants.CA_FILE, con
we need path to build the constants.


https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/vdscli.py
File lib/vdsm/vdscli.py:

Line 103
Line 104
Line 105
Line 106
Line 107
> Do we use tsPath? Do we need to support this?
In this code we need it. We would need to explore whether we could hard code 
the path. I am not really sure whether it is good idea.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-01 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 7:

(3 comments)

I think that the issue is trying to support dynamic pki dir, while some of the 
code is using static one (/etc/pki/vdsm). Lets simplify and support only static 
pki dir and use simple constants in constants.py.

https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/sslutils.py
File lib/vdsm/sslutils.py:

Line 263: 
Line 264: def create_ssl_context():
Line 265: sslctx = None
Line 266: if config.getboolean('vars', 'ssl'):
Line 267: path = config.get('vars', 'trust_store_path')
We can remove this configuration, it does not work anyway - all the code using 
certificates.XXX ignores this value.
Line 268: protocol = (
Line 269: ssl.PROTOCOL_SSLv23
Line 270: if config.get('vars', 'ssl_protocol') == 'sslv23'
Line 271: else ssl.PROTOCOL_TLSv1


https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/tool/configurators/certificates.py
File lib/vdsm/tool/configurators/certificates.py:

Line 30
Line 31
Line 32
Line 33
Line 34
Please move  the 4 lines above to constants, and use constants.CA_FILE, 
constants.CERT_FILE and constants.KEY_FILE in the code.


https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/vdscli.py
File lib/vdsm/vdscli.py:

Line 103
Line 104
Line 105
Line 106
Line 107
Do we use tsPath? Do we need to support this?


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-01 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 7:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/7/lib/vdsm/constants.py.in
File lib/vdsm/constants.py.in:

Line 157: # localtion of the certificates
Line 158: def get_cert_paths(path):
Line 159: return (os.path.join(path, 'keys', 'vdsmkey.pem'),
Line 160: os.path.join(path, 'certs', 'vdsmcert.pem'),
Line 161: os.path.join(path, 'certs', 'cacert.pem'))
This module is for constants, not for functions.

Why do we need the path argument?

If you need to access temporary certificates (e.g. for testing), you can create 
your certificates in a temporary directory and monkeypatch the constants so the 
code accessing them will see the fake certificates.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-07-01 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 7: Verified+1

Verified by updating vdsm and running a vm.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-06-20 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 4:

(2 comments)

https://gerrit.ovirt.org/#/c/52354/4/lib/vdsm/certutils.py
File lib/vdsm/certutils.py:

Line 23: 
Line 24: def get_cert_paths(path):
Line 25: return (os.path.join(path, 'keys', 'vdsmkey.pem'),
Line 26: os.path.join(path, 'certs', 'vdsmcert.pem'),
Line 27: os.path.join(path, 'certs', 'cacert.pem'))
> We don't need new module to have 3 constant strings, just more this to vdsm
Done


https://gerrit.ovirt.org/#/c/52354/4/lib/vdsm/tool/configurators/certificates.py
File lib/vdsm/tool/configurators/certificates.py:

Line 30
Line 31
Line 32
Line 33
Line 34
> These constants are just fine, not sure why do you want to replace them.
All of them are the same in few places in vdsm. I just want to have the 
definition common and be used in many places.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-06-19 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 4:

(1 comment)

https://gerrit.ovirt.org/#/c/52354/4/lib/vdsm/tool/configurators/certificates.py
File lib/vdsm/tool/configurators/certificates.py:

Line 30
Line 31
Line 32
Line 33
Line 34
These constants are just fine, not sure why do you want to replace them.

Can you explain what is the issue?


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-06-19 Thread nsoffer 
Nir Soffer has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 6:

Please address my comments from version 4:
https://gerrit.ovirt.org/#/c/52354/4..6/lib/vdsm/certutils.py,unified

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: utils: build cert paths in single place

2016-05-09 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 2:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: utils: build cert paths in single place

2016-04-11 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 1:

(2 comments)

https://gerrit.ovirt.org/#/c/52354/1/lib/vdsm/sslutils.py
File lib/vdsm/sslutils.py:

PS1, Line 162: tils.monotonic_time()
> this is a good idea, but to do it by the book, better split this formatting
Done


https://gerrit.ovirt.org/#/c/52354/1/lib/vdsm/tool/configurators/certificates.py
File lib/vdsm/tool/configurators/certificates.py:

PS1, Line 39: get_cert_paths
> It is a good idea to have a central place to get this data. But I'd avoid t
Will introduce new module


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: utils: build cert paths in single place

2016-04-11 Thread fromani 
Francesco Romani has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 1: Code-Review-1

-1 for visibility only

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: utils: build cert paths in single place

2016-04-11 Thread fromani 
Francesco Romani has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 1:

(2 comments)

concept is fine IMO, but I'd polish a bit the implementation.

https://gerrit.ovirt.org/#/c/52354/1/lib/vdsm/sslutils.py
File lib/vdsm/sslutils.py:

PS1, Line 162: tils.monotonic_time()
this is a good idea, but to do it by the book, better split this formatting 
change:

1. one patch that moves from
"from vdsm.utils import monotonic_time"
to
"import utils"
(use utils facilities wherever needed) nothing else
2. this patch that uses the new function to get the ssl paths.


https://gerrit.ovirt.org/#/c/52354/1/lib/vdsm/tool/configurators/certificates.py
File lib/vdsm/tool/configurators/certificates.py:

PS1, Line 39: get_cert_paths
It is a good idea to have a central place to get this data. But I'd avoid to 
dump this in utils.py.
Could be worth its own module alltogether.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: utils: build cert paths in single place

2016-04-11 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 1:

ping

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Francesco Romani 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: utils: build cert paths in single place

2016-01-18 Thread piotr . kliczewski 
Piotr Kliczewski has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 1: Verified+1

Verified while running jsonrpc client

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Piotr Kliczewski 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: utils: build cert paths in single place

2016-01-18 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: utils: build cert paths in single place
..


Patch Set 1:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: utils: build cert paths in single place

2016-01-18 Thread piotr . kliczewski 
Piotr Kliczewski has uploaded a new change for review.

Change subject: utils: build cert paths in single place
..

utils: build cert paths in single place

Change-Id: I58dd3a5f7c1503fc38b6c6a204c036c06d09941b
Signed-off-by: pkliczewski 
---
M lib/vdsm/m2cutils.py
M lib/vdsm/sslutils.py
M lib/vdsm/tool/configurators/certificates.py
M lib/vdsm/tool/configurators/libvirt.py
M lib/vdsm/utils.py
M lib/vdsm/vdscli.py
6 files changed, 31 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/52354/1

diff --git a/lib/vdsm/m2cutils.py b/lib/vdsm/m2cutils.py
index fa0d2aa..8ed22ba 100644
--- a/lib/vdsm/m2cutils.py
+++ b/lib/vdsm/m2cutils.py
@@ -19,15 +19,12 @@
 #
 from __future__ import absolute_import
 import logging
-import os
 from six.moves import http_client as httplib
 from six.moves import xmlrpc_client as xmlrpclib
 import socket
 import ssl
 
-from vdsm.utils import (
-monotonic_time,
-)
+from vdsm import utils
 from .config import config
 
 from M2Crypto import SSL, X509, threading
@@ -247,7 +244,7 @@
 handshake_finished_handler,
 handshake_timeout=SSL_HANDSHAKE_TIMEOUT,
 ):
-self._give_up_at = monotonic_time() + handshake_timeout
+self._give_up_at = utils.monotonic_time() + handshake_timeout
 self._has_been_set_up = False
 self._is_handshaking = True
 self._sslctx = sslctx
@@ -271,7 +268,7 @@
 dispatcher.socket = client_socket
 
 def next_check_interval(self):
-return max(self._give_up_at - monotonic_time(), 0)
+return max(self._give_up_at - utils.monotonic_time(), 0)
 
 def readable(self, dispatcher):
 if self.has_expired():
@@ -284,7 +281,7 @@
 return False
 
 def has_expired(self):
-return monotonic_time() >= self._give_up_at
+return utils.monotonic_time() >= self._give_up_at
 
 def handle_read(self, dispatcher):
 if not self._has_been_set_up:
@@ -303,10 +300,8 @@
 
 def create_ssl_context():
 if config.getboolean('vars', 'ssl'):
-truststore_path = config.get('vars', 'trust_store_path')
-key_file = os.path.join(truststore_path, 'keys', 'vdsmkey.pem')
-cert_file = os.path.join(truststore_path, 'certs', 'vdsmcert.pem')
-ca_cert = os.path.join(truststore_path, 'certs', 'cacert.pem')
+store_path = config.get('vars', 'trust_store_path')
+key_file, cert_file, ca_cert = utils.get_cert_paths(store_path)
 protocol = config.get('vars', 'ssl_protocol')
 sslctx = SSLContext(cert_file, key_file, ca_cert=ca_cert,
 protocol=protocol)
diff --git a/lib/vdsm/sslutils.py b/lib/vdsm/sslutils.py
index df2f519..041da49 100644
--- a/lib/vdsm/sslutils.py
+++ b/lib/vdsm/sslutils.py
@@ -19,14 +19,13 @@
 #
 from __future__ import absolute_import
 import logging
-import os
 from six.moves import xmlrpc_client as xmlrpclib
 from six.moves import http_client as httplib
 import socket
 import ssl
 
 from ssl import SSLError
-from vdsm.utils import monotonic_time
+from vdsm import utils
 from .config import config
 
 
@@ -160,7 +159,7 @@
 handshake_finished_handler,
 handshake_timeout=SSL_HANDSHAKE_TIMEOUT,
 ):
-self._give_up_at = monotonic_time() + handshake_timeout
+self._give_up_at = utils.monotonic_time() + handshake_timeout
 self._has_been_set_up = False
 self._is_handshaking = True
 self.want_read = True
@@ -184,7 +183,7 @@
 self._has_been_set_up = True
 
 def next_check_interval(self):
-return max(self._give_up_at - monotonic_time(), 0)
+return max(self._give_up_at - utils.monotonic_time(), 0)
 
 def readable(self, dispatcher):
 if self.has_expired():
@@ -201,7 +200,7 @@
 return self.want_write
 
 def has_expired(self):
-return monotonic_time() >= self._give_up_at
+return utils.monotonic_time() >= self._give_up_at
 
 def handle_read(self, dispatcher):
 self._handle_io(dispatcher)
@@ -261,17 +260,13 @@
 def create_ssl_context():
 sslctx = None
 if config.getboolean('vars', 'ssl'):
-truststore_path = config.get('vars', 'trust_store_path')
+store_path = config.get('vars', 'trust_store_path')
 protocol = (
 ssl.PROTOCOL_SSLv23
 if config.get('vars', 'ssl_protocol') == 'sslv23'
 else ssl.PROTOCOL_TLSv1
 )
-sslctx = SSLContext(
-key_file=os.path.join(truststore_path, 'keys', 'vdsmkey.pem'),
-cert_file=os.path.join(truststore_path, 'certs',
-   'vdsmcert.pem'),
-ca_certs=os.path.join(truststore_path, 'certs', 'cacert.pem'),
-protocol=protocol
-)
+key_file, cert_file, ca_certs =