x/gantt
Code Issues Proposed changes

Removed old cloud_topic queue setup, it is no longer used.

Browse Source
This commit is contained in:
Eric Day
2010-08-18 18:25:16 -07:00
parent d0a49a8313
commit a2765a1012
4 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/nova-api
View File

@@ -26,7 +26,6 @@ from tornado import httpserver
from tornado import ioloop from tornado import ioloop
from nova import flags from nova import flags
from nova import rpc
from nova import server from nova import server
from nova import utils from nova import utils
from nova.endpoint import admin from nova.endpoint import admin
@@ -43,14 +42,7 @@ def main(_argv):
'Admin': admin.AdminController()} 'Admin': admin.AdminController()}
_app = api.APIServerApplication(controllers) _app = api.APIServerApplication(controllers)
conn = rpc.Connection.instance()
consumer = rpc.AdapterConsumer(connection=conn,
topic=FLAGS.cloud_topic,
proxy=controllers['Cloud'])
io_inst = ioloop.IOLoop.instance() io_inst = ioloop.IOLoop.instance()
_injected = consumer.attach_to_tornado(io_inst)
http_server = httpserver.HTTPServer(_app) http_server = httpserver.HTTPServer(_app)
http_server.listen(FLAGS.cc_port) http_server.listen(FLAGS.cc_port)
logging.debug('Started HTTP server on %s', FLAGS.cc_port) logging.debug('Started HTTP server on %s', FLAGS.cc_port)

1
nova/endpoint/cloud.py
View File

@@ -45,7 +45,6 @@ from nova.volume import service
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
flags.DEFINE_string('cloud_topic', 'cloud', 'the topic clouds listen on')
def _gen_key(user_id, key_name): def _gen_key(user_id, key_name):

1
nova/flags.py
View File

@@ -168,7 +168,6 @@ def DECLARE(name, module_string, flag_values=FLAGS):
DEFINE_string('connection_type', 'libvirt', 'libvirt, xenapi or fake') DEFINE_string('connection_type', 'libvirt', 'libvirt, xenapi or fake')
DEFINE_integer('s3_port', 3333, 's3 port') DEFINE_integer('s3_port', 3333, 's3 port')
DEFINE_string('s3_host', '127.0.0.1', 's3 host') DEFINE_string('s3_host', '127.0.0.1', 's3 host')
#DEFINE_string('cloud_topic', 'cloud', 'the topic clouds listen on')
DEFINE_string('compute_topic', 'compute', 'the topic compute nodes listen on') DEFINE_string('compute_topic', 'compute', 'the topic compute nodes listen on')
DEFINE_string('volume_topic', 'volume', 'the topic volume nodes listen on') DEFINE_string('volume_topic', 'volume', 'the topic volume nodes listen on')
DEFINE_string('network_topic', 'network', 'the topic network nodes listen on') DEFINE_string('network_topic', 'network', 'the topic network nodes listen on')

4
nova/tests/cloud_unittest.py
View File

@@ -47,10 +47,6 @@ class CloudTestCase(test.BaseTestCase):
# set up our cloud # set up our cloud
self.cloud = cloud.CloudController() self.cloud = cloud.CloudController()
self.cloud_consumer = rpc.AdapterConsumer(connection=self.conn,
topic=FLAGS.cloud_topic,
proxy=self.cloud)
self.injected.append(self.cloud_consumer.attach_to_tornado(self.ioloop))
# set up a service # set up a service
self.compute = service.ComputeService() self.compute = service.ComputeService()