Change in vdsm[master]: ssl: runtime config to choose implementation

piotr.kliczewski at gmail.com piotr.kliczewski at gmail.com
Tue Oct 13 07:41:42 UTC 2015


Piotr Kliczewski has posted comments on this change.

Change subject: ssl: runtime config to choose implementation
......................................................................


Patch Set 15:

(4 comments)

https://gerrit.ovirt.org/#/c/44689/15/configure.ac
File configure.ac:

Line 161:         [--enable-m2c],
Line 162:         [build using m2crypto @<:@default=yes@:>@]
Line 163:     )],
Line 164:     ,
Line 165:     [enable_m2c="yes"]
> as the code is right now - nothing will change in debian by this flag
It will change. We call dh_auto_configure with --disable-m2c so it will set it config.py and it will be using ssl during build and runtime.
Line 166: )
Line 167: AM_CONDITIONAL([M2C], [test "${enable_m2c}" = "yes"])
Line 168: 
Line 169: # Users and groups


https://gerrit.ovirt.org/#/c/44689/15/lib/vdsm/config.py.in
File lib/vdsm/config.py.in:

Line 220: '
> Please note that between parts of this string literal there is no implicit 
Done


https://gerrit.ovirt.org/#/c/44689/15/tests/integration/jsonRpcHelper.py
File tests/integration/jsonRpcHelper.py:

Line 38: from vdsm.config import config
Line 39: from vdsm import utils
Line 40: 
Line 41: if config.get('vars', 'ssl_implementation') == 'm2c':
Line 42:     from integration.m2chelper import DEAFAULT_SSL_CONTEXT
> Piotr,
Yes, it someone by mistake will change setting in config.py it will fail
Line 43: else:
Line 44:     from integration.sslhelper import DEAFAULT_SSL_CONTEXT
Line 45: 
Line 46: PERMUTATIONS = tuple(product((True, False), ("xml", "stomp")))


https://gerrit.ovirt.org/#/c/44689/15/vdsm.spec.in
File vdsm.spec.in:

Line 628: sed -i -e 's/^software_version =.*/software_version = "'"${baseversion}"'"/' \
Line 629:        -e 's/^raw_version_revision =.*/raw_version_revision = "'"${rawversion}"'"/' \
Line 630:        -e 's/^software_revision =.*/software_revision = "'"${baserelease}"'"/' vdsm/dsaversion.py
Line 631: 
Line 632: sed -i -e 's/@SSl_IMPLEMENTATION@/%{ssl_implementation}/g' lib/vdsm/config.py
> don't you need to do it in debian as well?
I need to do it just missed it.
Line 633: 
Line 634: %install
Line 635: rm -rf %{buildroot}
Line 636: make DESTDIR=%{buildroot} install


-- 
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: 15
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: Ondřej Svoboda <osvoboda 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
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