diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-02-22 16:09:41 -0800 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-02-22 16:09:41 -0800 |
| commit | ab6b11b0399655ccdd9619be00470eda464cf2a7 (patch) | |
| tree | 106555967dd96322e0a4081ad7bf0b16012725b2 | |
| parent | e8a3f461319c1ee20a18f3a375af5e1e958af05e (diff) | |
| download | nova-ab6b11b0399655ccdd9619be00470eda464cf2a7.tar.gz nova-ab6b11b0399655ccdd9619be00470eda464cf2a7.tar.xz nova-ab6b11b0399655ccdd9619be00470eda464cf2a7.zip | |
Don't blindly concatenate queue name if second portiion is None
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 2697fac73..009ed1f06 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1209,7 +1209,9 @@ def project_get_network_v6(context, project_id): def queue_get_for(_context, topic, physical_node_id): # FIXME(ja): this should be servername? - return "%s.%s" % (topic, physical_node_id) + if physical_node_id: + return "%s.%s" % (topic, physical_node_id) + return topic ################### |