Change in vdsm[master]: ssl: runtime config to choose implementation
ybronhei at redhat.com
ybronhei at redhat.com
Thu Sep 17 18:30:51 UTC 2015
Yaniv Bronhaim has posted comments on this change.
Change subject: ssl: runtime config to choose implementation
......................................................................
Patch Set 8: Code-Review-1
(3 comments)
https://gerrit.ovirt.org/#/c/44689/8/lib/vdsm/config.py.in
File lib/vdsm/config.py.in:
Line 207:
Line 208: ('connection_stats_timeout', '3600',
Line 209: 'Time in seconds defining how frequently we log transport stats'),
Line 210:
Line 211: ('ssl_implementation', 'm2c',
m2crypto
Line 212: 'Specifies which ssl implementation should be used.'
Line 213: 'There are 2 options:'
Line 214: '"m2c" to use the m2crypto module (default)'
Line 215: '"ssl" to use the standard python ssl module'),
https://gerrit.ovirt.org/#/c/44689/8/lib/vdsm/sslcompat.py
File lib/vdsm/sslcompat.py:
Line 38: if _USED_IMPLEMENTATION == 'm2c':
Line 39: sslutils
Line 40: SSLHandshakeDispatcher
Line 41: SSLSocket
Line 42:
whaaa? :/
please do
use_default_ssl = False
if config..==m2crypto (stop shorting things..):
try:
imports
except ImportError:
log no m2crypto , using sslutils
use_default_ssl=True
if use_default_ssl:
from . import sslutils
...
#we need satisfy pyflakes (always..)
sslutils
..
Line 43: if _USED_IMPLEMENTATION is None:
Line 44: from . import sslutils
Line 45: from .sslutils import SSLHandshakeDispatcher
Line 46: from ssl import SSLSocket
https://gerrit.ovirt.org/#/c/44689/8/vdsm.spec.in
File vdsm.spec.in:
Line 1077: %endif
Line 1078: %if %{with_ssl}
Line 1079: %{python_sitelib}/%{vdsm_name}/sslutils.py*
Line 1080: %else
Line 1081: %exclude %{python_sitelib}/%{vdsm_name}/sslutils.py*
why do you need to exclude the file?
Line 1082: %endif
Line 1083: %{python_sitelib}/%{vdsm_name}/supervdsm.py*
Line 1084: %{python_sitelib}/%{vdsm_name}/sysctl.py*
Line 1085: %{python_sitelib}/%{vdsm_name}/udevadm.py*
--
To view, visit https://gerrit.ovirt.org/44689
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9881d11e30ced9c34bfe602bba3d968f57e0fe15
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski at gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Nir Soffer <nsoffer at redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski at gmail.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Yeela Kaplan <ykaplan at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-HasComments: Yes
More information about the vdsm-patches
mailing list