diff options
author | masumotok <masumotok@nttdata.co.jp> | 2011-01-14 03:37:41 +0900 |
---|---|---|
committer | masumotok <masumotok@nttdata.co.jp> | 2011-01-14 03:37:41 +0900 |
commit | b887c9bb04aabccf268abcccd32d9ab1c53ebfc0 (patch) | |
tree | 7de4ea9122ed809a549f2eea11f35715fc79f536 /nova/service.py | |
parent | 41a9ad538cc70d4f8f39eb51c1d137917967b04c (diff) | |
parent | efd116da3da634156f6acb8190d21f6ef24e0235 (diff) | |
download | nova-b887c9bb04aabccf268abcccd32d9ab1c53ebfc0.tar.gz nova-b887c9bb04aabccf268abcccd32d9ab1c53ebfc0.tar.xz nova-b887c9bb04aabccf268abcccd32d9ab1c53ebfc0.zip |
merge trunk rev560
Diffstat (limited to 'nova/service.py')
-rw-r--r-- | nova/service.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/service.py b/nova/service.py index c360dcf80..ff44e49a8 100644 --- a/nova/service.py +++ b/nova/service.py @@ -120,11 +120,13 @@ class Service(object): self.timers.append(periodic) 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, - 'report_count': 0}) + 'report_count': 0, + 'availability_zone': zone}) self.service_id = service_ref['id'] def _update_host_ref(self, context, host_ref): |