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
(cherry picked from commit efa2f7b0ff
)
This commit is contained in:
parent
b04aa15284
commit
209d9c845c
|
@ -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')
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -187,7 +187,7 @@ function start_barbican {
|
|||
sleep 10
|
||||
|
||||
# Start the retry scheduler server up.
|
||||
run_process barbican-retry "$BARBICAN_BIN_DIR/barbican-retry --config-file=$BARBICAN_CONF_DIR/barbican-api.conf"
|
||||
run_process barbican-retry "$BARBICAN_BIN_DIR/barbican-retry --config-file=$BARBICAN_CONF_DIR/barbican.conf"
|
||||
}
|
||||
|
||||
# stop_barbican - Stop running processes
|
||||
|
|
Loading…
Reference in New Issue