Merge "Pass cli options to commands"

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')

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')

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')

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')