0a8f019be0
Provide a new method:
nova.utils.get_ksa_adapter(service_type, ks_auth=None, ks_session=None,
min_version=None, max_version=None))
...to configure a keystoneauth1 Adapter for a service. The Adapter, and
its component keystoneauth1 artifacts not passed into the method, are
loaded based on options in the conf group corresponding to the specified
service_type.
The ultimate goal is to replace the various disparate mechanisms used by
different services to do endpoint URL and version discovery. In Queens,
the original mechanisms will still take precedence, but (other than
[glance]api_servers - see the spec) will be deprecated. In Rocky, the
deprecated options will be removed.
This change incorporates the above utility into endpoint discovery for
glance and ironic. Future change sets will do the same for other
services (cinder, neutron, placement).
Change-Id: If625411f40be0ba642baeb02950f568f43673655
Partial-Implements: bp use-ksa-adapter-for-endpoints
Closes-Bug: #1707860
105 lines
3.3 KiB
Python
105 lines
3.3 KiB
Python
# Copyright 2015 Intel Corporation
|
|
# 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.
|
|
|
|
from keystoneauth1 import loading as ks_loading
|
|
from oslo_config import cfg
|
|
|
|
from nova.conf import utils as confutils
|
|
|
|
|
|
DEFAULT_SERVICE_TYPE = 'baremetal'
|
|
|
|
ironic_group = cfg.OptGroup(
|
|
'ironic',
|
|
title='Ironic Options',
|
|
help="""
|
|
Configuration options for Ironic driver (Bare Metal).
|
|
If using the Ironic driver following options must be set:
|
|
* auth_type
|
|
* auth_url
|
|
* project_name
|
|
* username
|
|
* password
|
|
* project_domain_id or project_domain_name
|
|
* user_domain_id or user_domain_name
|
|
""")
|
|
|
|
ironic_options = [
|
|
cfg.URIOpt(
|
|
'api_endpoint',
|
|
schemes=['http', 'https'],
|
|
deprecated_for_removal=True,
|
|
deprecated_reason='Endpoint lookup uses the service catalog via '
|
|
'common keystoneauth1 Adapter configuration '
|
|
'options. In the current release, api_endpoint will '
|
|
'override this behavior, but will be ignored and/or '
|
|
'removed in a future release. To achieve the same '
|
|
'result, use the endpoint_override option instead.',
|
|
sample_default='http://ironic.example.org:6385/',
|
|
help='URL override for the Ironic API endpoint.'),
|
|
cfg.IntOpt(
|
|
'api_max_retries',
|
|
# TODO(raj_singh): Change this default to some sensible number
|
|
default=60,
|
|
min=0,
|
|
help="""
|
|
The number of times to retry when a request conflicts.
|
|
If set to 0, only try once, no retries.
|
|
|
|
Related options:
|
|
|
|
* api_retry_interval
|
|
"""),
|
|
cfg.IntOpt(
|
|
'api_retry_interval',
|
|
default=2,
|
|
min=0,
|
|
help="""
|
|
The number of seconds to wait before retrying the request.
|
|
|
|
Related options:
|
|
|
|
* api_max_retries
|
|
"""),
|
|
cfg.IntOpt(
|
|
'serial_console_state_timeout',
|
|
default=10,
|
|
min=0,
|
|
help='Timeout (seconds) to wait for node serial console state '
|
|
'changed. Set to 0 to disable timeout.'),
|
|
]
|
|
|
|
deprecated_opts = {
|
|
'endpoint_override': [cfg.DeprecatedOpt('api_endpoint',
|
|
group=ironic_group.name)]}
|
|
|
|
|
|
def register_opts(conf):
|
|
conf.register_group(ironic_group)
|
|
conf.register_opts(ironic_options, group=ironic_group)
|
|
confutils.register_ksa_opts(conf, ironic_group, DEFAULT_SERVICE_TYPE,
|
|
deprecated_opts=deprecated_opts)
|
|
|
|
|
|
def list_opts():
|
|
return {ironic_group: (
|
|
ironic_options +
|
|
ks_loading.get_session_conf_options() +
|
|
ks_loading.get_auth_common_conf_options() +
|
|
ks_loading.get_auth_plugin_conf_options('v3password') +
|
|
confutils.get_ksa_adapter_opts(DEFAULT_SERVICE_TYPE,
|
|
deprecated_opts=deprecated_opts))
|
|
}
|