9519601401
Change the Adapter loading for glance to use the auth from the user
context instead of exposing and requiring it in the conf. With this
change, it is possible to leave the [glance] conf section empty and
still be able to discover the image API endpoint from the service
catalog.
Note that, when we do this, we often end up with the user auth being a
_ContextAuthPlugin, which doesn't conform to the characteristics of
keystoneauth1.identity.base.BaseIdentityPlugin as augmented in
keystoneauth1 3.1.0. This requires a series of workarounds until bug
1709118 is fixed. These, along with workarounds for bugs 1707993 and
1707995, are subsumed with this change set in a (hopefully temporary)
helper method nova.utils.get_endpoint.
This lays the foundation for other services that should use user
context for authentication - those via which Nova is acting on behalf
of the user, i.e. cinder, keystone, and (sometimes) neutron[1].
(Services such as placement and ironic (and sometimes neutron) should
continue to use admin auth context loaded from the conf.)
[1] bb4faf40df/nova/network/neutronv2/api.py (L149-L160)
Co-Authored-By: Eric Fried <efried@us.ibm.com>
Partial-Implements: bp use-ksa-adapter-for-endpoints
Change-Id: I4e755b9c66ec8bc3af0393e81cffd91c56064717
94 lines
3.6 KiB
Python
94 lines
3.6 KiB
Python
# Copyright 2013 OpenStack Foundation
|
|
# 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.
|
|
|
|
import functools
|
|
import sys
|
|
|
|
from os_xenapi.client import exception as xenapi_exception
|
|
from os_xenapi.client import host_glance
|
|
from oslo_log import log as logging
|
|
import six
|
|
|
|
from nova.compute import utils as compute_utils
|
|
import nova.conf
|
|
from nova import exception
|
|
from nova.image import glance
|
|
from nova import utils
|
|
from nova.virt.xenapi import vm_utils
|
|
|
|
CONF = nova.conf.CONF
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class GlanceStore(object):
|
|
def _call_glance_plugin(self, context, instance, session, fn, image_id,
|
|
params):
|
|
glance_api_servers = glance.get_api_servers(context)
|
|
sr_path = vm_utils.get_sr_path(session)
|
|
extra_headers = glance.generate_identity_headers(context)
|
|
|
|
def pick_glance(kwargs):
|
|
server = next(glance_api_servers)
|
|
kwargs['endpoint'] = server
|
|
kwargs['api_version'] = 2
|
|
# NOTE(sdague): is the return significant here at all?
|
|
return server
|
|
|
|
def retry_cb(context, instance, exc=None):
|
|
if exc:
|
|
exc_info = sys.exc_info()
|
|
LOG.debug(six.text_type(exc), exc_info=exc_info)
|
|
compute_utils.add_instance_fault_from_exc(
|
|
context, instance, exc, exc_info)
|
|
|
|
cb = functools.partial(retry_cb, context, instance)
|
|
|
|
return fn(session, CONF.glance.num_retries, pick_glance, cb, image_id,
|
|
sr_path, extra_headers, **params)
|
|
|
|
def download_image(self, context, session, instance, image_id):
|
|
params = {'uuid_stack': vm_utils._make_uuid_stack()}
|
|
try:
|
|
vdis = self._call_glance_plugin(context, instance, session,
|
|
host_glance.download_vhd, image_id,
|
|
params)
|
|
except xenapi_exception.PluginRetriesExceeded:
|
|
raise exception.CouldNotFetchImage(image_id=image_id)
|
|
|
|
return vdis
|
|
|
|
def upload_image(self, context, session, instance, image_id, vdi_uuids):
|
|
params = {'vdi_uuids': vdi_uuids}
|
|
props = params['properties'] = {}
|
|
props['auto_disk_config'] = instance['auto_disk_config']
|
|
props['os_type'] = instance.get('os_type', None) or (
|
|
CONF.xenserver.default_os_type)
|
|
|
|
compression_level = vm_utils.get_compression_level()
|
|
if compression_level:
|
|
props['xenapi_image_compression_level'] = compression_level
|
|
|
|
auto_disk_config = utils.get_auto_disk_config_from_instance(instance)
|
|
if utils.is_auto_disk_config_disabled(auto_disk_config):
|
|
props["auto_disk_config"] = "disabled"
|
|
|
|
try:
|
|
self._call_glance_plugin(context, instance, session,
|
|
host_glance.upload_vhd, image_id, params)
|
|
except xenapi_exception.PluginRetriesExceeded:
|
|
raise exception.CouldNotUploadImage(image_id=image_id)
|
|
except xenapi_exception.PluginImageNotFound:
|
|
raise exception.ImageNotFound(image_id=image_id)
|