038427a541
The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b4 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Add dependency_links to setup.py so that oslo-config can be installed from the tarball URL specified in pip-requires. Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Make tools/hacking.py include oslo in IMPORT_EXCEPTIONS like it already does for paste. It turns out imp.find_module() doesn't correct handle namespace packages. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
89 lines
3.2 KiB
Python
89 lines
3.2 KiB
Python
# Copyright (c) 2012 OpenStack, LLC.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""Availability zone helper functions."""
|
|
|
|
from oslo.config import cfg
|
|
|
|
from nova import db
|
|
from nova.openstack.common import log as logging
|
|
|
|
availability_zone_opts = [
|
|
cfg.StrOpt('internal_service_availability_zone',
|
|
default='internal',
|
|
help='availability_zone to show internal services under'),
|
|
cfg.StrOpt('default_availability_zone',
|
|
# deprecated in Grizzly release
|
|
deprecated_name='node_availability_zone',
|
|
default='nova',
|
|
help='default compute node availability_zone'),
|
|
]
|
|
|
|
CONF = cfg.CONF
|
|
CONF.register_opts(availability_zone_opts)
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def set_availability_zones(context, services):
|
|
# Makes sure services isn't a sqlalchemy object
|
|
services = [dict(service.iteritems()) for service in services]
|
|
metadata = db.aggregate_host_get_by_metadata_key(context,
|
|
key='availability_zone')
|
|
for service in services:
|
|
az = CONF.internal_service_availability_zone
|
|
if service['topic'] == "compute":
|
|
if metadata.get(service['host']):
|
|
az = u','.join(list(metadata[service['host']]))
|
|
else:
|
|
az = CONF.default_availability_zone
|
|
service['availability_zone'] = az
|
|
return services
|
|
|
|
|
|
def get_host_availability_zone(context, host, conductor_api=None):
|
|
if conductor_api:
|
|
metadata = conductor_api.aggregate_metadata_get_by_host(
|
|
context, host, key='availability_zone')
|
|
else:
|
|
metadata = db.aggregate_metadata_get_by_host(
|
|
context, host, key='availability_zone')
|
|
if 'availability_zone' in metadata:
|
|
return list(metadata['availability_zone'])[0]
|
|
else:
|
|
return CONF.default_availability_zone
|
|
|
|
|
|
def get_availability_zones(context):
|
|
"""Return available and unavailable zones."""
|
|
enabled_services = db.service_get_all(context, False)
|
|
disabled_services = db.service_get_all(context, True)
|
|
enabled_services = set_availability_zones(context, enabled_services)
|
|
disabled_services = set_availability_zones(context, disabled_services)
|
|
|
|
available_zones = []
|
|
for zone in [service['availability_zone'] for service
|
|
in enabled_services]:
|
|
if zone not in available_zones:
|
|
available_zones.append(zone)
|
|
|
|
not_available_zones = []
|
|
zones = [service['available_zones'] for service in disabled_services
|
|
if service['available_zones'] not in available_zones]
|
|
for zone in zones:
|
|
if zone not in not_available_zones:
|
|
not_available_zones.append(zone)
|
|
return (available_zones, not_available_zones)
|