diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-18 23:09:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-18 23:09:23 +0000 |
| commit | f261a2edc18468b6e13af171cee38c996459f413 (patch) | |
| tree | eed239978e425e7fb3b16bdf874cea3660291662 /nova/service.py | |
| parent | 7d20f1fe553b0db5883e787992413e7a0ca4f099 (diff) | |
| parent | e9d342637b78a4d2ef13852905ee4a2d88b48af2 (diff) | |
| download | nova-f261a2edc18468b6e13af171cee38c996459f413.tar.gz nova-f261a2edc18468b6e13af171cee38c996459f413.tar.xz nova-f261a2edc18468b6e13af171cee38c996459f413.zip | |
Merge "Remove some db calls from db servicegroup driver."
Diffstat (limited to 'nova/service.py')
| -rw-r--r-- | nova/service.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/service.py b/nova/service.py index 0fde14baa..de000bfa8 100644 --- a/nova/service.py +++ b/nova/service.py @@ -421,12 +421,11 @@ class Service(object): self.model_disconnected = False ctxt = context.get_admin_context() try: - service_ref = self.conductor_api.service_get_by_args(ctxt, - self.host, - self.binary) + self.service_ref = self.conductor_api.service_get_by_args(ctxt, + self.host, self.binary) self.service_id = service_ref['id'] except exception.NotFound: - self._create_service_ref(ctxt) + self.service_ref = self._create_service_ref(ctxt) if self.backdoor_port is not None: self.manager.backdoor_port = self.backdoor_port @@ -479,6 +478,7 @@ class Service(object): } service = self.conductor_api.service_create(context, svc_values) self.service_id = service['id'] + return service def __getattr__(self, key): manager = self.__dict__.get('manager', None) |