diff options
| author | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-01-17 04:12:27 +0900 |
|---|---|---|
| committer | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-01-17 04:12:27 +0900 |
| commit | a56bc070784c7ea23528025463ea7f0bee133150 (patch) | |
| tree | 67c16becb0b778500d06e0565461f26ecd7c5c33 /nova/service.py | |
| parent | 525544e689334346305ecc11552105fc1b32a5dd (diff) | |
| parent | 825652456ac826a2108956ba8a9cbdc8221520dc (diff) | |
| download | nova-a56bc070784c7ea23528025463ea7f0bee133150.tar.gz nova-a56bc070784c7ea23528025463ea7f0bee133150.tar.xz nova-a56bc070784c7ea23528025463ea7f0bee133150.zip | |
merged trunk rev569
Diffstat (limited to 'nova/service.py')
| -rw-r--r-- | nova/service.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/service.py b/nova/service.py index 7323c7ff1..1acfe3078 100644 --- a/nova/service.py +++ b/nova/service.py @@ -89,7 +89,7 @@ class Service(object): except exception.NotFound: self._create_service_ref(ctxt) - if 'nova-compute' == self.binary: + if 'nova-compute' == self.binary: self.manager.update_service(ctxt, self.host, self.binary) conn1 = rpc.Connection.instance(new=True) @@ -119,11 +119,11 @@ class Service(object): def _create_service_ref(self, context): zone = FLAGS.node_availability_zone service_ref = db.service_create(context, - {'host': self.host, - 'binary': self.binary, - 'topic': self.topic, + {'host':self.host, + 'binary':self.binary, + 'topic':self.topic, 'report_count': 0, - 'availability_zone': zone}) + 'availability_zone':zone}) self.service_id = service_ref['id'] def __getattr__(self, key): |