summaryrefslogtreecommitdiffstats
path: root/nova/db
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-31 01:29:40 +0000
committerGerrit Code Review <review@openstack.org>2012-05-31 01:29:40 +0000
commitf3edf7ff7edefede242de50aca59abc4c6adc7f9 (patch)
tree68e8260744e8ae02515c02fe71251362a031506f /nova/db
parent069f8f3ea4ac20271cddca0c3e209ef0af8cd0d6 (diff)
parent26353bb372081f674cf5fd3dbbffd990918f3803 (diff)
Merge "Move queue_get_for() from db to rpc."
Diffstat (limited to 'nova/db')
-rw-r--r--nova/db/api.py8
-rw-r--r--nova/db/sqlalchemy/api.py8
2 files changed, 0 insertions, 16 deletions
diff --git a/nova/db/api.py b/nova/db/api.py
index 75739df8d..d33584036 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -848,14 +848,6 @@ def network_update(context, network_id, values):
###################
-def queue_get_for(context, topic, physical_node_id):
- """Return a channel to send a message to a node with a topic."""
- return IMPL.queue_get_for(context, topic, physical_node_id)
-
-
-###################
-
-
def iscsi_target_count_by_host(context, host):
"""Return count of export devices."""
return IMPL.iscsi_target_count_by_host(context, host)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 718438569..30c556b4d 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2203,14 +2203,6 @@ def network_update(context, network_id, values):
###################
-def queue_get_for(context, topic, physical_node_id):
- # FIXME(ja): this should be servername?
- return "%s.%s" % (topic, physical_node_id)
-
-
-###################
-
-
@require_admin_context
def iscsi_target_count_by_host(context, host):
return model_query(context, models.IscsiTarget).\