diff options
author | Russell Bryant <rbryant@redhat.com> | 2012-05-25 14:13:34 -0400 |
---|---|---|
committer | Russell Bryant <rbryant@redhat.com> | 2012-05-25 14:48:44 -0400 |
commit | 965d855202da9e4aba06ab421239016080f0b3e6 (patch) | |
tree | 8d675cc1ceaa3b8630fc4481519c5f1809ca1764 /nova/flags.py | |
parent | d9de51ac52307ac017b1e7cee5320c9d4915b16e (diff) | |
download | nova-965d855202da9e4aba06ab421239016080f0b3e6.tar.gz nova-965d855202da9e4aba06ab421239016080f0b3e6.tar.xz nova-965d855202da9e4aba06ab421239016080f0b3e6.zip |
Localize rpc options to rpc code.
Part of blueprint common-rpc.
Move rpc options from nova.flags into nova.rpc code. This is necessary
before the rpc code can be moved to openstack-common.
Change-Id: I474c3660e1cbd3ab663571b1e088c84deb905e0b
Diffstat (limited to 'nova/flags.py')
-rw-r--r-- | nova/flags.py | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/nova/flags.py b/nova/flags.py index 337dc979c..c23df1b3c 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -125,9 +125,6 @@ debug_opts = [ cfg.BoolOpt('fake_network', default=False, help='If passed, use fake network devices and addresses'), - cfg.BoolOpt('fake_rabbit', - default=False, - help='If passed, use a fake RabbitMQ provider'), ] FLAGS.register_cli_opts(log_opts) @@ -189,41 +186,6 @@ global_opts = [ cfg.StrOpt('network_topic', default='network', help='the topic network nodes listen on'), - cfg.StrOpt('rabbit_host', - default='localhost', - help='the RabbitMQ host'), - cfg.IntOpt('rabbit_port', - default=5672, - help='the RabbitMQ port'), - cfg.BoolOpt('rabbit_use_ssl', - default=False, - help='connect over SSL for RabbitMQ'), - cfg.StrOpt('rabbit_userid', - default='guest', - help='the RabbitMQ userid'), - cfg.StrOpt('rabbit_password', - default='guest', - help='the RabbitMQ password'), - cfg.StrOpt('rabbit_virtual_host', - default='/', - help='the RabbitMQ virtual host'), - cfg.IntOpt('rabbit_retry_interval', - default=1, - help='how frequently to retry connecting with RabbitMQ'), - cfg.IntOpt('rabbit_retry_backoff', - default=2, - help='how long to backoff for between retries when connecting ' - 'to RabbitMQ'), - cfg.IntOpt('rabbit_max_retries', - default=0, - help='maximum retries with trying to connect to RabbitMQ ' - '(the default of 0 implies an infinite retry count)'), - cfg.StrOpt('control_exchange', - default='nova', - help='the main RabbitMQ exchange to connect to'), - cfg.BoolOpt('rabbit_durable_queues', - default=False, - help='use durable queues in RabbitMQ'), cfg.BoolOpt('api_rate_limit', default=True, help='whether to rate limit the api'), |