Merge "Fix hardcoded topic strings with constants."

This commit is contained in:
Jenkins
2012-10-26 21:47:29 +00:00
committed by Gerrit Code Review
7 changed files with 20 additions and 8 deletions

View File

@@ -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()

View File

@@ -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()

View File

@@ -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()

View File

@@ -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()

View File

@@ -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()

View File

@@ -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()

View File

@@ -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()