summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorMasanori Itoh <itoumsn@nttdata.co.jp>2011-04-05 11:40:35 +0900
committerMasanori Itoh <itoumsn@nttdata.co.jp>2011-04-05 11:40:35 +0900
commit4e8ade85ec5f8dcd7c76bb06de5cd1f90d54d2a4 (patch)
treef4b0a2eaa01246d1563e9c2972dba4991cd105ba /nova/compute
parent95fe2026e869e2da29196f8bf3e48ae2a2560e46 (diff)
parentc0a8904508edb0687b588d40a7bd181d0393884f (diff)
Rebased to trunk 942.
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 1dbd73f8f..996955fe3 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -37,10 +37,14 @@ from nova.compute import instance_types
from nova.scheduler import api as scheduler_api
from nova.db import base
-FLAGS = flags.FLAGS
+
LOG = logging.getLogger('nova.compute.api')
+FLAGS = flags.FLAGS
+flags.DECLARE('vncproxy_topic', 'nova.vnc')
+
+
def generate_default_hostname(instance_id):
"""Default function to generate a hostname given an instance reference."""
return str(instance_id)