openstack/cinder
Code Issues Proposed changes

Merge "CONF add suppress_requests_ssl_warnings"

Browse Source
This commit is contained in:
Jenkins 2016-03-05 02:24:09 +00:00 committed by Gerrit Code Review
commit e7f7cccf5a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cinder/volume/manager.py
View File

@ -36,7 +36,7 @@ intact.
"""
import requests
import time
from oslo_config import cfg
@ -113,6 +113,9 @@ volume_manager_opts = [
'location of a backend, then creating a volume type to '
'allow the user to select by these different '
'properties.'),
cfg.BoolOpt('suppress_requests_ssl_warnings',
default=False,
help='Suppress requests library SSL certificate warnings.'),
]
CONF = cfg.CONF
@ -263,6 +266,13 @@ class VolumeManager(manager.SchedulerDependentManager):
else:
curr_active_backend_id = service.active_backend_id
if self.configuration.suppress_requests_ssl_warnings:
LOG.warning(_LW("Suppressing requests library SSL Warnings"))
requests.packages.urllib3.disable_warnings(
requests.packages.urllib3.exceptions.InsecureRequestWarning)
requests.packages.urllib3.disable_warnings(
requests.packages.urllib3.exceptions.InsecurePlatformWarning)
self.driver = importutils.import_object(
volume_driver,
configuration=self.configuration,