Piotr Kliczewski 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
if you always do that why do you need the configure flag?? for fedora\rhel
For debian we are going to use ssl only due to issue in m2crypto so we do not need the flag. 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:
can't you use the sslcompact and all places to avoid this if else clause?
We are using different contexts for testing so we do not want to use sslcompat here. Please notice that we are using specific module here. 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
just put m2c as default. user will modify it manually if required. the glob
When we provide --enable-m2c or --disable-m2c we update config.py which seems to be better than manual update. Every manual step is error prone and it can confuse people. Line 633: Line 634: %install Line 635: rm -rf %{buildroot} Line 636: make DESTDIR=%{buildroot} install