openstack/octavia
Code Issues Proposed changes

Merge "Make keystone verify configurable"

Browse Source
This commit is contained in:
Jenkins 2015-09-18 22:35:22 +00:00 committed by Gerrit Code Review
commit 57ce15f268
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/octavia.conf
View File

@ -51,6 +51,7 @@
# admin_user = octavia
# admin_password = password
# admin_tenant_name = service
# insecure = False
[keystone_authtoken_v3]
# If using Keystone v3

3
octavia/common/keystone.py
View File

@ -60,7 +60,8 @@ def get_session():
try:
kc = client.Password(**kwargs)
_SESSION = session.Session(auth=kc)
_SESSION = session.Session(
auth=kc, verify=not cfg.CONF.keystone_authtoken.insecure)
except Exception:
with excutils.save_and_reraise_exception():
LOG.exception(_LE("Error creating Keystone session."))