diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 04:09:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 04:09:31 +0000 |
| commit | ddb2400047d0afd8bc8e408ac3e9034b4c625952 (patch) | |
| tree | f99a7d34ee48a22adf9f6d76adb047fec1a4d9a7 /nova/service.py | |
| parent | 2a2892f15e0b74eb36b25519756bcb0d19637915 (diff) | |
| parent | 1ab2fc6477c402e29a95fbc93fe4a67950c083df (diff) | |
| download | nova-ddb2400047d0afd8bc8e408ac3e9034b4c625952.tar.gz nova-ddb2400047d0afd8bc8e408ac3e9034b4c625952.tar.xz nova-ddb2400047d0afd8bc8e408ac3e9034b4c625952.zip | |
Merge "Remove availability_zones from service table"
Diffstat (limited to 'nova/service.py')
| -rw-r--r-- | nova/service.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nova/service.py b/nova/service.py index fc0ac4a1b..43619fd56 100644 --- a/nova/service.py +++ b/nova/service.py @@ -92,7 +92,6 @@ service_opts = [ CONF = cfg.CONF CONF.register_opts(service_opts) CONF.import_opt('host', 'nova.config') -CONF.import_opt('node_availability_zone', 'nova.config') class SignalExit(SystemExit): @@ -447,13 +446,11 @@ class Service(object): self.timers.append(periodic) def _create_service_ref(self, context): - zone = CONF.node_availability_zone service_ref = db.service_create(context, {'host': self.host, 'binary': self.binary, 'topic': self.topic, - 'report_count': 0, - 'availability_zone': zone}) + 'report_count': 0}) self.service_id = service_ref['id'] def __getattr__(self, key): |