From 4fcd5468a0edb3c5e8cd2d62ad5dd57ba8f3d525 Mon Sep 17 00:00:00 2001
From: Sean Eagan <sean.eagan@att.com>
Date: Fri, 1 Jun 2018 11:59:40 -0500
Subject: [PATCH] bugfix(cli): Remove redundant oslo_log register_options calls

This removes extra calls to oslo_log.register_options that were causing
a `oslo_config.cfg.ArgsAlreadyParsedError` when using the CLI.

Change-Id: Ib253ac0dd72f7a2a5558e6ee68736fb5c35ae1e0
---
 armada/cli/__init__.py | 1 -
 armada/shell.py        | 2 --
 2 files changed, 3 deletions(-)

diff --git a/armada/cli/__init__.py b/armada/cli/__init__.py
index 8f924f72..e108a95a 100644
--- a/armada/cli/__init__.py
+++ b/armada/cli/__init__.py
@@ -31,7 +31,6 @@ class CliAction(object):
 
     def __init__(self):
         self.logger = LOG
-        logging.register_options(CONF)
         logging.set_defaults(default_log_levels=CONF.default_log_levels)
         logging.setup(CONF, 'armada')
 
diff --git a/armada/shell.py b/armada/shell.py
index 8b9f9f6c..1130be57 100644
--- a/armada/shell.py
+++ b/armada/shell.py
@@ -84,8 +84,6 @@ def main(ctx, debug, api, url, token):
                     token=token)
             )
 
-    log.register_options(CONF)
-
     if debug:
         CONF.debug = debug