From 12f1bdde2a501ed71d5f678c6b80371b0c3b6f4c Mon Sep 17 00:00:00 2001
From: Terry Howe <terrylhowe@gmail.com>
Date: Fri, 1 May 2015 06:53:59 -0600
Subject: [PATCH] Fix insecure/verify options
The insecure and verify options are broken so that verify always
gets set to True. One problem was that the parsed args not
defaulted so os_cloud_config thinks there was always a command
line specified. The other problem was getattr was called on cloud
config instead of get.
Closes-Bug: #1450855
Change-Id: Ib5f004f51a7453cc8f5a89759e2031ec42e04a30
---
openstackclient/shell.py | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index 5e2910215d..da985cbc4b 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -187,11 +187,13 @@ class OpenStackShell(app.App):
verify_group = parser.add_mutually_exclusive_group()
verify_group.add_argument(
'--verify',
- action='store_true',
+ default=None,
+ action='store_false',
help='Verify server certificate (default)',
)
verify_group.add_argument(
'--insecure',
+ default=None,
action='store_true',
help='Disable server certificate verification',
)
@@ -224,12 +226,6 @@ class OpenStackShell(app.App):
# Parent __init__ parses argv into self.options
super(OpenStackShell, self).initialize_app(argv)
- # Resolve the verify/insecure exclusive pair here as cloud_config
- # doesn't know about verify
- self.options.insecure = (
- self.options.insecure and not self.options.verify
- )
-
# Set the default plugin to token_endpoint if rl and token are given
if (self.options.url and self.options.token):
# Use service token authentication
@@ -253,10 +249,8 @@ class OpenStackShell(app.App):
if cacert:
self.verify = cacert
else:
- self.verify = not getattr(self.cloud.config, 'insecure', False)
-
- # Neutralize verify option
- self.options.verify = None
+ self.verify = not self.cloud.config.get('insecure', False)
+ self.verify = self.cloud.config.get('verify', self.verify)
# Save default domain
self.default_domain = self.options.os_default_domain