2ea2399ec3
This patch makes Nova:
a) support Identity v3 params when creating an Ironiccient by
creating a v3Password auth plugin and a Session;
b) deprecate auth parameters admin_tenant_name, admin_username
admin_password and admin_url;
c) remove support to admin_auth_token auth parameter [1].
[1] admin_auth_token was deprecated
(317d9d8f13) in favour of admin_username and
admin_password (which are deprecated now in favour of username and
password). More info at Keystone release notes (see Deprecation Notes
and Security Issues):
http://docs.openstack.org/releasenotes/keystone/mitaka.html#deprecation-notes
Change-Id: Id837d26bb21c158de0504627e488c0692aef1e24
Closes-Bug: #1582045
107 lines
3.3 KiB
Python
107 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
|
|
|
|
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
|
|
|
|
Please note that if you are using Identity v2 API (deprecated),
|
|
you don't need to provide domain information, since domains are
|
|
a v3 concept.
|
|
""")
|
|
|
|
# FIXME(clenimar): The following deprecated auth options are kept for backwards
|
|
# compatibility. Please remove them as soon as we drop its support:
|
|
# `admin_username`, `admin_password`, `admin_url` and `admin_tenant_name`.
|
|
ironic_options = [
|
|
cfg.StrOpt(
|
|
'api_endpoint',
|
|
sample_default='http://ironic.example.org:6385/',
|
|
help='URL override for the Ironic API endpoint.'),
|
|
cfg.StrOpt(
|
|
'admin_username',
|
|
deprecated_for_removal=True,
|
|
help='Ironic keystone admin name. '
|
|
'Use ``username`` instead.'),
|
|
cfg.StrOpt(
|
|
'admin_password',
|
|
secret=True,
|
|
deprecated_for_removal=True,
|
|
help='Ironic keystone admin password. '
|
|
'Use ``password`` instead.'),
|
|
cfg.StrOpt(
|
|
'admin_url',
|
|
deprecated_for_removal=True,
|
|
help='Keystone public API endpoint. '
|
|
'Use ``auth_url`` instead.'),
|
|
cfg.StrOpt(
|
|
'admin_tenant_name',
|
|
deprecated_for_removal=True,
|
|
help='Ironic keystone tenant name. '
|
|
'Use ``project_name`` instead.'),
|
|
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
|
|
"""),
|
|
]
|
|
|
|
|
|
def register_opts(conf):
|
|
conf.register_group(ironic_group)
|
|
conf.register_opts(ironic_options, group=ironic_group)
|
|
ks_loading.register_auth_conf_options(conf, group=ironic_group.name)
|
|
ks_loading.register_session_conf_options(conf, group=ironic_group.name)
|
|
|
|
|
|
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')
|
|
}
|