summaryrefslogtreecommitdiffstats
path: root/nova/service.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-18 23:09:58 +0000
committerGerrit Code Review <review@openstack.org>2013-01-18 23:09:58 +0000
commitab04b00edfbb21131fd370325089e69d5fd8e1f0 (patch)
tree9e6b9d46c7edc794407f3894e15b6c7f67ee4139 /nova/service.py
parentbaa476d32dc0352b03061547f0a829371ea09f57 (diff)
parentab7e0ce6db4cf451f46c20bdb3ae8cf60dff4db6 (diff)
downloadnova-ab04b00edfbb21131fd370325089e69d5fd8e1f0.tar.gz
nova-ab04b00edfbb21131fd370325089e69d5fd8e1f0.tar.xz
nova-ab04b00edfbb21131fd370325089e69d5fd8e1f0.zip
Merge "Use conductor in the servicegroup db driver."
Diffstat (limited to 'nova/service.py')
-rw-r--r--nova/service.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/service.py b/nova/service.py
index de000bfa8..6e7e8bafd 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -411,7 +411,7 @@ class Service(object):
self.db_allowed = db_allowed
self.conductor_api = conductor.API(use_local=db_allowed)
self.conductor_api.wait_until_ready(context.get_admin_context())
- self.servicegroup_api = servicegroup.API()
+ self.servicegroup_api = servicegroup.API(db_allowed=db_allowed)
def start(self):
verstr = version.version_string_with_package()