From ae216f58e42b35caab58f082b1d7e42d7dccfe9a Mon Sep 17 00:00:00 2001
From: Jim Rollenhagen <jim@jimrollenhagen.com>
Date: Fri, 13 May 2016 05:34:56 -0400
Subject: [PATCH] Remove verbose option

This was deprecated in Liberty in oslo.log, and was recently removed.
Remove it here so we're not completely broken when this releases.

http://git.openstack.org/cgit/openstack/oslo.log/commit/?id=7c671ea77f4d7701d0def9a9e17b6c49310ca438

Change-Id: I8143cc1dfc52decef245b8b23740766dcf3456ad
---
 doc/source/cmds/ironic-dbsync.rst                      |  4 ----
 ironic/tests/base.py                                   |  2 +-
 .../notes/remove-verbose-option-261f1b9e24212ee2.yaml  | 10 ++++++++++
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/remove-verbose-option-261f1b9e24212ee2.yaml

diff --git a/doc/source/cmds/ironic-dbsync.rst b/doc/source/cmds/ironic-dbsync.rst
index 283f30446..7634cf047 100644
--- a/doc/source/cmds/ironic-dbsync.rst
+++ b/doc/source/cmds/ironic-dbsync.rst
@@ -36,10 +36,6 @@ run the following::
 
   Print debugging output.
 
-.. option:: -v, --verbose
-
-  Print more verbose output.
-
 .. option:: --version
 
   Show the program's version number and exit.
diff --git a/ironic/tests/base.py b/ironic/tests/base.py
index cb25178c3..ad9374be4 100644
--- a/ironic/tests/base.py
+++ b/ironic/tests/base.py
@@ -116,7 +116,7 @@ class TestCase(testtools.TestCase):
                     fatal_exception_format_errors=True,
                     tempdir=tempfile.tempdir)
         self.set_defaults(host='fake-mini',
-                          verbose=True)
+                          debug=True)
         self.set_defaults(connection="sqlite://",
                           sqlite_synchronous=False,
                           group='database')
diff --git a/releasenotes/notes/remove-verbose-option-261f1b9e24212ee2.yaml b/releasenotes/notes/remove-verbose-option-261f1b9e24212ee2.yaml
new file mode 100644
index 000000000..72879e8fa
--- /dev/null
+++ b/releasenotes/notes/remove-verbose-option-261f1b9e24212ee2.yaml
@@ -0,0 +1,10 @@
+---
+upgrade:
+  - The 'verbose' configuration option was removed,
+    consequently the "--verbose, -v" parameter from all
+    command lines was also removed. This affects the
+    ironic-api, ironic-conductor, ironic-dbsync, and
+    ironic-rootwrap commands. The verbose config/parameter
+    was originally a shortcut to set the log level to INFO, however
+    the log level has defaulted to INFO since this option was
+    deprecated, so this option was a noop.