diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2017-06-20 06:31:29 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2017-06-22 16:24:59 +0000 |
| commit | dbfb9c4e94e500592a8b93f42b7b87230d0af311 (patch) | |
| tree | e8c15131bdca7e7c52abe93f641c366e4d6934cb /snaps/openstack/utils/keystone_utils.py | |
| parent | 39b46e7e43dffff8f4abfbc142c9e28c9ce0d260 (diff) | |
Enable https for Openstack in Snaps
When running in https environment, snaps should provide two options:
1. To support certification verify when https certification file is provided;
2. To disable server certificate verification without cert file.
JIRA: SNAPS-84
Change-Id: I5a9094238db5c8017cc8b80e3353adc6e793b552
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'snaps/openstack/utils/keystone_utils.py')
| -rw-r--r-- | snaps/openstack/utils/keystone_utils.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/snaps/openstack/utils/keystone_utils.py b/snaps/openstack/utils/keystone_utils.py index 337bdc2..8f5effd 100644 --- a/snaps/openstack/utils/keystone_utils.py +++ b/snaps/openstack/utils/keystone_utils.py @@ -12,12 +12,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import requests +import logging + from keystoneclient.client import Client from keystoneauth1.identity import v3, v2 from keystoneauth1 import session -import logging - +import requests logger = logging.getLogger('keystone_utils') @@ -59,7 +59,8 @@ def keystone_session(os_creds): if os_creds.proxy_settings: req_session = requests.Session() req_session.proxies = {'http': os_creds.proxy_settings.host + ':' + os_creds.proxy_settings.port} - return session.Session(auth=auth, session=req_session) + return session.Session(auth=auth, session=req_session, + verify=os_creds.cacert) def keystone_client(os_creds): |