From efa2f7b0ff4a8786f1a03aa1dc924982243d2a6a Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Thu, 21 Jul 2016 19:36:58 +0200
Subject: [PATCH] Pass cli options to commands

When calling barbican-worker, barbican-retry or
barbican-keystone_listener, the given cli options were not recognized.
I.e. calling "barbican-worker -h" just tried to start the worker process
instead of printing the help.

Change-Id: Iff8ba2d05bbbafe9c4440a5ebfe05085d3f8a90f
Closes-Bug: #1603499
---
 barbican/cmd/keystone_listener.py | 3 +++
 barbican/cmd/retry_scheduler.py   | 3 +++
 barbican/cmd/worker.py            | 3 +++
 barbican/tests/cmd/test_cmd.py    | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/barbican/cmd/keystone_listener.py b/barbican/cmd/keystone_listener.py
index a856ed356..2caa3790a 100644
--- a/barbican/cmd/keystone_listener.py
+++ b/barbican/cmd/keystone_listener.py
@@ -43,6 +43,7 @@ from barbican.common import config
 from barbican import i18n as u
 from barbican import queue
 from barbican.queue import keystone_listener
+from barbican import version
 
 from oslo_log import log
 from oslo_service import service
@@ -58,6 +59,8 @@ def main():
         config.setup_remote_pydev_debug()
 
         CONF = config.CONF
+        CONF(sys.argv[1:], project='barbican',
+             version=version.version_info.version_string)
 
         # Import and configure logging.
         log.setup(CONF, 'barbican')
diff --git a/barbican/cmd/retry_scheduler.py b/barbican/cmd/retry_scheduler.py
index cd9b3fb4a..8ec685458 100644
--- a/barbican/cmd/retry_scheduler.py
+++ b/barbican/cmd/retry_scheduler.py
@@ -39,6 +39,7 @@ if os.path.exists(os.path.join(possible_topdir, 'barbican', '__init__.py')):
 from barbican.common import config
 from barbican import queue
 from barbican.queue import retry_scheduler
+from barbican import version
 
 from oslo_log import log
 from oslo_service import service
@@ -52,6 +53,8 @@ def fail(returncode, e):
 def main():
     try:
         CONF = config.CONF
+        CONF(sys.argv[1:], project='barbican',
+             version=version.version_info.version_string)
 
         # Import and configure logging.
         log.setup(CONF, 'barbican-retry-scheduler')
diff --git a/barbican/cmd/worker.py b/barbican/cmd/worker.py
index 3f59f1e86..77ec256b8 100644
--- a/barbican/cmd/worker.py
+++ b/barbican/cmd/worker.py
@@ -39,6 +39,7 @@ if os.path.exists(os.path.join(possible_topdir, 'barbican', '__init__.py')):
 from barbican.common import config
 from barbican import queue
 from barbican.queue import server
+from barbican import version
 
 from oslo_log import log
 from oslo_service import service
@@ -52,6 +53,8 @@ def fail(returncode, e):
 def main():
     try:
         CONF = config.CONF
+        CONF(sys.argv[1:], project='barbican',
+             version=version.version_info.version_string)
 
         # Import and configure logging.
         log.setup(CONF, 'barbican')
diff --git a/barbican/tests/cmd/test_cmd.py b/barbican/tests/cmd/test_cmd.py
index 742799626..e71dda6fa 100644
--- a/barbican/tests/cmd/test_cmd.py
+++ b/barbican/tests/cmd/test_cmd.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import mock
+import sys
 
 from barbican.cmd import retry_scheduler
 from barbican.cmd import worker
@@ -26,6 +27,7 @@ class WhenInvokingRetryServiceCommand(utils.BaseTestCase):
 
     def setUp(self):
         super(WhenInvokingRetryServiceCommand, self).setUp()
+        sys.argv = ['barbican-retry']
 
     @mock.patch('barbican.common.config')
     @mock.patch('barbican.queue.init')
@@ -62,6 +64,7 @@ class WhenInvokingWorkerCommand(test_keystone_listener.UtilMixin,
     def setUp(self):
         super(WhenInvokingWorkerCommand, self).setUp()
         database_utils.setup_in_memory_db()
+        sys.argv = ['barbican-worker']
 
     @mock.patch('barbican.queue.init')
     @mock.patch('barbican.queue.get_server')