From 0bf28bec6097d128aa439b288b249fafcac7dbc0 Mon Sep 17 00:00:00 2001 From: Michael H Wilson Date: Tue, 16 Oct 2012 15:47:52 -0600 Subject: Fix hardcoded topic strings with constants. Replace hardcoded topic strings like 'volume' or 'compute' with config constants like FLAGS.volume_topic, etc. See bug #1057831 and bug #1061628. Change-Id: I817ecc3cbe3245b51a0c047be58d17edfec8a838 --- bin/nova-cert | 3 ++- bin/nova-compute | 4 +++- bin/nova-console | 4 +++- bin/nova-consoleauth | 5 +++-- bin/nova-network | 4 +++- bin/nova-scheduler | 4 +++- bin/nova-volume | 4 +++- 7 files changed, 20 insertions(+), 8 deletions(-) (limited to 'bin') diff --git a/bin/nova-cert b/bin/nova-cert index 81189492a..ebdd0e0b9 100755 --- a/bin/nova-cert +++ b/bin/nova-cert @@ -39,8 +39,9 @@ from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) + FLAGS = flags.FLAGS logging.setup("nova") utils.monkey_patch() - server = service.Service.create(binary='nova-cert') + server = service.Service.create(binary='nova-cert', topic=FLAGS.cert_topic) service.serve(server) service.wait() diff --git a/bin/nova-compute b/bin/nova-compute index 0a8432b1e..2a2a0013a 100755 --- a/bin/nova-compute +++ b/bin/nova-compute @@ -41,8 +41,10 @@ from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) + FLAGS = flags.FLAGS logging.setup('nova') utils.monkey_patch() - server = service.Service.create(binary='nova-compute') + server = service.Service.create(binary='nova-compute', + topic=FLAGS.compute_topic) service.serve(server) service.wait() diff --git a/bin/nova-console b/bin/nova-console index 97b152930..f664040b7 100755 --- a/bin/nova-console +++ b/bin/nova-console @@ -39,7 +39,9 @@ from nova import service if __name__ == '__main__': flags.parse_args(sys.argv) + FLAGS = flags.FLAGS logging.setup("nova") - server = service.Service.create(binary='nova-console') + server = service.Service.create(binary='nova-console', + topic=FLAGS.console_topic) service.serve(server) service.wait() diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth index f8277daf6..58ecd37b3 100755 --- a/bin/nova-consoleauth +++ b/bin/nova-consoleauth @@ -39,8 +39,9 @@ from nova import service if __name__ == "__main__": flags.parse_args(sys.argv) + FLAGS = flags.FLAGS logging.setup("nova") - - server = service.Service.create(binary='nova-consoleauth') + server = service.Service.create(binary='nova-consoleauth', + topic=FLAGS.consoleauth_topic) service.serve(server) service.wait() diff --git a/bin/nova-network b/bin/nova-network index ca9a97551..36343bb73 100755 --- a/bin/nova-network +++ b/bin/nova-network @@ -41,8 +41,10 @@ from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) + FLAGS = flags.FLAGS logging.setup("nova") utils.monkey_patch() - server = service.Service.create(binary='nova-network') + server = service.Service.create(binary='nova-network', + topic=FLAGS.network_topic) service.serve(server) service.wait() diff --git a/bin/nova-scheduler b/bin/nova-scheduler index e100156df..64dadb9e4 100755 --- a/bin/nova-scheduler +++ b/bin/nova-scheduler @@ -43,8 +43,10 @@ from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) + FLAGS = flags.FLAGS logging.setup("nova") utils.monkey_patch() - server = service.Service.create(binary='nova-scheduler') + server = service.Service.create(binary='nova-scheduler', + topic=FLAGS.scheduler_topic) service.serve(server) service.wait() diff --git a/bin/nova-volume b/bin/nova-volume index 2c10c99f5..602b332b7 100755 --- a/bin/nova-volume +++ b/bin/nova-volume @@ -41,8 +41,10 @@ from nova import utils if __name__ == '__main__': flags.parse_args(sys.argv) + FLAGS = flags.FLAGS logging.setup("nova") utils.monkey_patch() - server = service.Service.create(binary='nova-volume') + server = service.Service.create(binary='nova-volume', + topic=FLAGS.volume_topic) service.serve(server) service.wait() -- cgit