summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-13 08:31:37 +0000
committerGerrit Code Review <review@openstack.org>2016-04-13 08:31:37 +0000
commit7b7620ab845e9e40e88c54910f0db4ecbe9c6033 (patch)
tree6b9eb73e66208e573a42c8321bab06c9a48229fd
parent1819edf733d4a24e3fe0a8a998d72a0f4f0a8339 (diff)
parentb5f10f43eb9fd1a046a3e80db09d8bc8c350c218 (diff)
downloadpython-openstackclient-7b7620ab845e9e40e88c54910f0db4ecbe9c6033.tar.gz
Merge "Fix SSL/TLS verification for network commands"
-rw-r--r--openstackclient/network/client.py3
-rw-r--r--releasenotes/notes/bug-1560157-bce572f58b43efa1.yaml7
2 files changed, 9 insertions, 1 deletions
diff --git a/openstackclient/network/client.py b/openstackclient/network/client.py
index 7714c525..dca9efc4 100644
--- a/openstackclient/network/client.py
+++ b/openstackclient/network/client.py
@@ -31,7 +31,8 @@ API_VERSIONS = {
def make_client(instance):
"""Returns a network proxy"""
- conn = connection.Connection(authenticator=instance.session.auth)
+ conn = connection.Connection(authenticator=instance.session.auth,
+ verify=instance.session.verify)
LOG.debug('Connection: %s', conn)
LOG.debug('Network client initialized using OpenStack SDK: %s',
conn.network)
diff --git a/releasenotes/notes/bug-1560157-bce572f58b43efa1.yaml b/releasenotes/notes/bug-1560157-bce572f58b43efa1.yaml
new file mode 100644
index 00000000..e5c394bc
--- /dev/null
+++ b/releasenotes/notes/bug-1560157-bce572f58b43efa1.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+ - Fixed SSL/TLS verification for Network v2 commands. The commands
+ were ignoring the ``--insecure`` and ``--os-cacert`` options and
+ the ``OS_CACERT`` environment variable which caused them to fail
+ with ``An SSL error occurred.`` when authenticating using SSL/TLS.
+ [Bug `1560157 <https://bugs.launchpad.net/python-openstackclient/+bug/1560157>`_]