From 1ab2fc6477c402e29a95fbc93fe4a67950c083df Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Thu, 20 Dec 2012 03:13:01 +0000 Subject: Remove availability_zones from service table This is the final step in enabling availability_zones using aggregate metadata. Previously all services had an availability_zone, but the availability_zone is only used for nova-compute. Services such as nova-scheduler, nova-network, nova-conductor have always spanned all availability_zones. After this change only compute nodes (nova-compute), will have an availability_zone. In order to preserve current APIs, when running: * nova host-list (os-hosts) * euca-describe-availability-zones verbose * nova-manage service list Internal services will appear in there own internal availability_zone (CONF.internal_service_availability_zone) Internal zone is hidden in euca-describe-availability_zones (non-verbose) CONF.node_availability_zone has been renamed to CONF.default_availability_zone and is only used by the nova-api and nova-scheduler. CONF.node_availability_zone still works but is deprecated DocImpact Completes blueprint aggregate-based-availability-zones Change-Id: Ib772df5f9ac2865f20df479f8ddce575a9ce3aff --- nova/servicegroup/db_driver.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'nova/servicegroup') diff --git a/nova/servicegroup/db_driver.py b/nova/servicegroup/db_driver.py index a52ed258c..f859f9f8b 100644 --- a/nova/servicegroup/db_driver.py +++ b/nova/servicegroup/db_driver.py @@ -72,7 +72,6 @@ class DbDriver(api.ServiceGroupDriver): def _report_state(self, service): """Update the state of this service in the datastore.""" ctxt = context.get_admin_context() - zone = CONF.node_availability_zone state_catalog = {} try: try: @@ -84,8 +83,6 @@ class DbDriver(api.ServiceGroupDriver): service_ref = db.service_get(ctxt, service.service_id) state_catalog['report_count'] = service_ref['report_count'] + 1 - if zone != service_ref['availability_zone']: - state_catalog['availability_zone'] = zone db.service_update(ctxt, service.service_id, state_catalog) -- cgit