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
This commit is contained in:
Michael H Wilson
2012-10-16 15:47:52 -06:00
parent 2afc94ef52
commit c27b62fee1
7 changed files with 20 additions and 8 deletions

View File

@@ -39,8 +39,9 @@ from nova import utils
if __name__ == '__main__': if __name__ == '__main__':
flags.parse_args(sys.argv) flags.parse_args(sys.argv)
FLAGS = flags.FLAGS
logging.setup("nova") logging.setup("nova")
utils.monkey_patch() 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.serve(server)
service.wait() service.wait()

View File

@@ -41,8 +41,10 @@ from nova import utils
if __name__ == '__main__': if __name__ == '__main__':
flags.parse_args(sys.argv) flags.parse_args(sys.argv)
FLAGS = flags.FLAGS
logging.setup('nova') logging.setup('nova')
utils.monkey_patch() 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.serve(server)
service.wait() service.wait()

View File

@@ -39,7 +39,9 @@ from nova import service
if __name__ == '__main__': if __name__ == '__main__':
flags.parse_args(sys.argv) flags.parse_args(sys.argv)
FLAGS = flags.FLAGS
logging.setup("nova") 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.serve(server)
service.wait() service.wait()

View File

@@ -39,8 +39,9 @@ from nova import service
if __name__ == "__main__": if __name__ == "__main__":
flags.parse_args(sys.argv) flags.parse_args(sys.argv)
FLAGS = flags.FLAGS
logging.setup("nova") 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.serve(server)
service.wait() service.wait()

View File

@@ -41,8 +41,10 @@ from nova import utils
if __name__ == '__main__': if __name__ == '__main__':
flags.parse_args(sys.argv) flags.parse_args(sys.argv)
FLAGS = flags.FLAGS
logging.setup("nova") logging.setup("nova")
utils.monkey_patch() 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.serve(server)
service.wait() service.wait()

View File

@@ -43,8 +43,10 @@ from nova import utils
if __name__ == '__main__': if __name__ == '__main__':
flags.parse_args(sys.argv) flags.parse_args(sys.argv)
FLAGS = flags.FLAGS
logging.setup("nova") logging.setup("nova")
utils.monkey_patch() 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.serve(server)
service.wait() service.wait()

View File

@@ -41,8 +41,10 @@ from nova import utils
if __name__ == '__main__': if __name__ == '__main__':
flags.parse_args(sys.argv) flags.parse_args(sys.argv)
FLAGS = flags.FLAGS
logging.setup("nova") logging.setup("nova")
utils.monkey_patch() 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.serve(server)
service.wait() service.wait()