Yeela Kaplan has uploaded a new change for review. Change subject: sslutils: change all config checks to use ssl_enabled ......................................................................
sslutils: change all config checks to use ssl_enabled Change-Id: Iec301a55c02943950d5f56702ec1dd58ed954340 Signed-off-by: Yeela Kaplan <[email protected]> --- M lib/vdsm/tool/configurators/certificates.py M lib/vdsm/tool/configurators/libvirt.py M lib/vdsm/vdscli.py M tests/functional/storageTests.py M vdsm/virt/migration.py 5 files changed, 11 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/41795/1 diff --git a/lib/vdsm/tool/configurators/certificates.py b/lib/vdsm/tool/configurators/certificates.py index fd361e5..97fe620 100644 --- a/lib/vdsm/tool/configurators/certificates.py +++ b/lib/vdsm/tool/configurators/certificates.py @@ -20,6 +20,7 @@ import sys from vdsm.config import config +from ... import sslutils from . import \ YES, \ @@ -78,5 +79,5 @@ 'vdsm/vdsm.conf' ) ) - return not config.getboolean('vars', 'ssl') or\ + return not sslutils.ssl_enabled() or\ os.path.isfile(CERT_FILE) diff --git a/lib/vdsm/tool/configurators/libvirt.py b/lib/vdsm/tool/configurators/libvirt.py index e182231..5da7ed0 100644 --- a/lib/vdsm/tool/configurators/libvirt.py +++ b/lib/vdsm/tool/configurators/libvirt.py @@ -25,6 +25,7 @@ import sys from vdsm.config import config +from ... import sslutils from . import \ InvalidRun, \ @@ -71,7 +72,7 @@ config.read(_getFile('VDSM_CONF')) vdsmConfiguration = { - 'ssl_enabled': config.getboolean('vars', 'ssl'), + 'ssl_enabled': sslutils.ssl_enabled(), 'sanlock_enabled': constants.SANLOCK_ENABLED, 'libvirt_selinux': constants.LIBVIRT_SELINUX } @@ -180,7 +181,7 @@ vdsm.conf. """ config.read(_getFile('VDSM_CONF')) - ssl = config.getboolean('vars', 'ssl') + ssl = sslutils.ssl_enabled() lconf_p = ParserWrapper({ 'listen_tcp': '0', diff --git a/lib/vdsm/vdscli.py b/lib/vdsm/vdscli.py index c80218d..e7ce8e8 100644 --- a/lib/vdsm/vdscli.py +++ b/lib/vdsm/vdscli.py @@ -66,7 +66,7 @@ try: from .config import config config.read(VDSM_CONF) - _USE_SSL = config.getboolean('vars', 'ssl') + _USE_SSL = sslutils.ssl_enabled() _TRUSTED_STORE_PATH = config.get('vars', 'trust_store_path') PORT = config.getint('addresses', 'management_port') ADDRESS = config.get('addresses', 'management_ip') diff --git a/tests/functional/storageTests.py b/tests/functional/storageTests.py index 8dc9b10..2199b7b 100644 --- a/tests/functional/storageTests.py +++ b/tests/functional/storageTests.py @@ -46,6 +46,7 @@ from vdsm.config import config from vdsm.constants import VDSM_USER, VDSM_GROUP from vdsm.utils import CommandPath, RollbackContext +from vdsm import sslutils from vdsm import vdscli from virt import vmstatus @@ -76,7 +77,7 @@ pass def setUp(self): - isSSL = config.getboolean('vars', 'ssl') + isSSL = sslutils.ssl_enabled() if isSSL and os.geteuid() != 0: raise SkipTest("Must be root to use SSL connection to server") self.s = vdscli.connect(useSSL=isSSL) diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index 2c7fb31..fc9a26d 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -26,6 +26,7 @@ import hooks import kaxmlrpclib from vdsm import utils +from vdsm import sslutils from vdsm import vdscli from vdsm.compat import pickle from vdsm.config import config @@ -115,7 +116,7 @@ config.getint('addresses', 'management_port')) self.remoteHost, _ = hostPort.rsplit(':', 1) - if config.getboolean('vars', 'ssl'): + if sslutils.ssl_enabled(): self._destServer = vdscli.connect( hostPort, useSSL=True, @@ -301,7 +302,7 @@ self.status = result raise RuntimeError('migration destination error: ' + result['status']['message']) - if config.getboolean('vars', 'ssl'): + if sslutils.ssl_enabled(): transport = 'tls' else: transport = 'tcp' -- To view, visit https://gerrit.ovirt.org/41795 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec301a55c02943950d5f56702ec1dd58ed954340 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
