]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: iscsi: use `ssl_verify` configuration option in restclient
authorRicardo Dias <rdias@suse.com>
Mon, 11 Mar 2019 15:43:13 +0000 (15:43 +0000)
committerRicardo Dias <rdias@suse.com>
Tue, 12 Mar 2019 10:15:56 +0000 (10:15 +0000)
Signed-off-by: Ricardo Dias <rdias@suse.com>
src/pybind/mgr/dashboard/services/iscsi_client.py

index cbbc14af3bd6d5ec350948039c1117eb512ff47e..94dad37296cffe646313e286c89d00613f083771 100644 (file)
@@ -13,6 +13,7 @@ except ImportError:
 
 from .iscsi_cli import IscsiGatewaysConfig
 from .. import logger
+from ..settings import Settings
 from ..rest_client import RestClient
 
 
@@ -30,7 +31,8 @@ class IscsiClient(RestClient):
         service_url = gateways_config['service_url']
 
         instance = cls._instances.get(gateway_name)
-        if not instance or service_url != instance.service_url:
+        if not instance or service_url != instance.service_url or \
+                instance.session.verify != Settings.ISCSI_API_SSL_VERIFICATION:
             url = urlparse(service_url)
             ssl = url.scheme == 'https'
             host = url.hostname
@@ -39,8 +41,10 @@ class IscsiClient(RestClient):
             password = url.password
             if not port:
                 port = 443 if ssl else 80
+
             auth = HTTPBasicAuth(username, password)
-            instance = IscsiClient(host, port, IscsiClient._CLIENT_NAME, ssl, auth)
+            instance = IscsiClient(host, port, IscsiClient._CLIENT_NAME, ssl,
+                                   auth, Settings.ISCSI_API_SSL_VERIFICATION)
             instance.service_url = service_url
             cls._instances[gateway_name] = instance