diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-07 09:57:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-07 09:57:49 +0000 |
| commit | fd7f10b993ef5262e76d604b38cfad25aed2266d (patch) | |
| tree | b4f097fad4d78c65b6548288599da7792dcfa44f /ironic_python_agent/extensions | |
| parent | 674f899fdd1912d12914df3c85b6d0ae2ca661ba (diff) | |
| parent | fdd11b54a5e3d7a9ee89628baba2990e4e00abdd (diff) | |
| download | ironic-python-agent-fd7f10b993ef5262e76d604b38cfad25aed2266d.tar.gz | |
Merge "Configure and use SSL-related requests options"
Diffstat (limited to 'ironic_python_agent/extensions')
| -rw-r--r-- | ironic_python_agent/extensions/standby.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ironic_python_agent/extensions/standby.py b/ironic_python_agent/extensions/standby.py index 637e4012..1b9f2dbc 100644 --- a/ironic_python_agent/extensions/standby.py +++ b/ironic_python_agent/extensions/standby.py @@ -19,6 +19,7 @@ import six import time from oslo_concurrency import processutils +from oslo_config import cfg from oslo_log import log from ironic_lib import disk_utils @@ -27,6 +28,7 @@ from ironic_python_agent.extensions import base from ironic_python_agent import hardware from ironic_python_agent import utils +CONF = cfg.CONF LOG = log.getLogger(__name__) IMAGE_CHUNK_SIZE = 1024 * 1024 # 1MB @@ -227,7 +229,9 @@ class ImageDownload(object): if no_proxy: os.environ['no_proxy'] = no_proxy proxies = image_info.get('proxies', {}) - resp = requests.get(url, stream=True, proxies=proxies) + verify, cert = utils.get_ssl_client_options(CONF) + resp = requests.get(url, stream=True, proxies=proxies, + verify=verify, cert=cert) if resp.status_code != 200: msg = ('Received status code {} from {}, expected 200. Response ' 'body: {}').format(resp.status_code, url, resp.text) |