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

ybronhei at redhat.com ybronhei at redhat.com
Tue Oct 13 11:30:36 UTC 2015


Yaniv Bronhaim has posted comments on this change.

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


Patch Set 16:

(3 comments)

https://gerrit.ovirt.org/#/c/44689/16/debian/rules
File debian/rules:

Line 33: 		SERVICE_PATH=/usr/sbin/service
Line 34: 
Line 35: override_dh_auto_build:
Line 36: 		sed -i -e 's/@SSl_IMPLEMENTATION@/ssl/g' lib/vdsm/config.py
Line 37: 		dh_auto_build
> For debian we are going to use ssl only due to issue in m2crypto so we do n
so why to have the flag at all?
Line 38: 
Line 39: destdir = debian/tmp
Line 40: 
Line 41: override_dh_auto_install:


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

Line 41: if config.get('vars', 'ssl_implementation') == 'm2c':
Line 42:     from integration.m2chelper import DEAFAULT_SSL_CONTEXT
Line 43: else:
Line 44:     from integration.sslhelper import DEAFAULT_SSL_CONTEXT
Line 45: 
> We are using different contexts for testing so we do not want to use sslcom
ok
Line 46: PERMUTATIONS = tuple(product((True, False), ("xml", "stomp")))
Line 47: 
Line 48: TIMEOUT = 3
Line 49: 


https://gerrit.ovirt.org/#/c/44689/16/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
> When we provide --enable-m2c or --disable-m2c we update config.py which see
also any additional flag that user can not be aware about- just keep fedora and rhel default to m2c and debian to ssl. that's 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: 16
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