From bfebac82825a7242ad4e2923e3b71d38b391f08e Mon Sep 17 00:00:00 2001
From: TerryHowe <terrylhowe@gmail.com>
Date: Mon, 10 Aug 2015 12:45:35 -0600
Subject: [PATCH] Allow debug to be set in configuration file

The current default value for debug in cliff is False.  Cloud
config assumes that it was set that way on the command line and
does not overlay it with the value from the configuration file.
Cliff bug:

https://bugs.launchpad.net/python-cliff/+bug/1483378

Change-Id: I66d82b489b2241dbcd1e1350e94259a54ce09de7
---
 openstackclient/shell.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index 72f663a093..f7704efcb0 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -232,10 +232,16 @@ class OpenStackShell(app.App):
                 },
             )
 
+        # TODO(thowe): Change cliff so the default value for debug
+        # can be set to None.
+        if not self.options.debug:
+            self.options.debug = None
         self.cloud = cc.get_one_cloud(
             cloud=self.options.cloud,
             argparse=self.options,
         )
+        if self.options.debug is not None:
+            self.options.debug = False
 
         self.log_configurator.configure(self.cloud)
         self.dump_stack_trace = self.log_configurator.dump_trace