From 00eebaf5bc5ff7a383a8ed085098abc24c8a2e74 Mon Sep 17 00:00:00 2001
From: TerryHowe <terrylhowe@gmail.com>
Date: Tue, 18 Aug 2015 10:09:46 -0600
Subject: [PATCH] Override the debug default and help text

Cliff sets the default debug value to False and this makes it
impossible to override debug with OCC.  If we set the default to
None, we can override debug in clouds.yaml.  Also, OSC changes
the meaning of --debug, so modify the help text.

Change-Id: I5e6680b2286cd7f55afe4b083fae5f8a4a9567a2
Closes-Bug: #1483378
---
 openstackclient/shell.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index a8b5ac4c88..566a7cd9f0 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -79,6 +79,10 @@ class OpenStackShell(app.App):
         help.HelpCommand.auth_required = False
         complete.CompleteCommand.auth_required = False
 
+        # Slight change to the meaning of --debug
+        self.DEFAULT_DEBUG_VALUE = None
+        self.DEFAULT_DEBUG_HELP = 'Set debug logging and traceback on errors.'
+
         super(OpenStackShell, self).__init__(
             description=__doc__.strip(),
             version=openstackclient.__version__,