diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-18 14:30:26 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-18 14:30:26 -0500 |
| commit | be8b74ff0226557df01d4bdce2c76d0157e09b8f (patch) | |
| tree | 397108295f5b46e8e574d95921515b3de16e1461 /nova/service.py | |
| parent | 11a10dc9a2fcaaf94e9c661fc9162fd5b8bd420e (diff) | |
| parent | 4577c11923f05ba60ec898186d3f959d86e5de4c (diff) | |
| download | nova-be8b74ff0226557df01d4bdce2c76d0157e09b8f.tar.gz nova-be8b74ff0226557df01d4bdce2c76d0157e09b8f.tar.xz nova-be8b74ff0226557df01d4bdce2c76d0157e09b8f.zip | |
Merge trunk.
Diffstat (limited to 'nova/service.py')
| -rw-r--r-- | nova/service.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/service.py b/nova/service.py index 8b2a22ce0..a8d52e93b 100644 --- a/nova/service.py +++ b/nova/service.py @@ -80,6 +80,7 @@ class Service(object): self.manager.init_host() self.model_disconnected = False ctxt = context.get_admin_context() + try: service_ref = db.service_get_by_args(ctxt, self.host, @@ -88,6 +89,9 @@ class Service(object): except exception.NotFound: self._create_service_ref(ctxt) + if 'nova-compute' == self.binary: + self.manager.update_service(ctxt, self.host, self.binary) + conn1 = rpc.Connection.instance(new=True) conn2 = rpc.Connection.instance(new=True) if self.report_interval: |