918775cb01
Inspector sets API urls for ironic and swift from the config. The better way would be to discovery them from the keystone catalog. Supporting this requires to register keystoneauth adapter options to all config sections for service clients auth. swiftclient still does not support adapter session client, so pass all options from adapter explicitly. New options were added 'service_type`, `service_name`, `region_name` `endpoint_override`, `interfaces`. Related-Bug: #1699547 Change-Id: I2e7ec02fdeeea21ef43136ddeabc98d499a8ba7f Co-Authored-By: Anton Arefiev <aarefiev@mirantis.com>
65 lines
2.4 KiB
Python
65 lines
2.4 KiB
Python
# 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 oslo_config import cfg
|
|
|
|
from ironic_inspector.common.i18n import _
|
|
from ironic_inspector.common import keystone
|
|
|
|
|
|
SWIFT_GROUP = 'swift'
|
|
SERVICE_TYPE = 'object-store'
|
|
|
|
|
|
_OPTS = [
|
|
cfg.IntOpt('max_retries',
|
|
default=2,
|
|
help=_('Maximum number of times to retry a Swift request, '
|
|
'before failing.')),
|
|
cfg.IntOpt('delete_after',
|
|
default=0,
|
|
help=_('Number of seconds that the Swift object will last '
|
|
'before being deleted. (set to 0 to never delete the '
|
|
'object).')),
|
|
cfg.StrOpt('container',
|
|
default='ironic-inspector',
|
|
help=_('Default Swift container to use when creating '
|
|
'objects.')),
|
|
cfg.StrOpt('os_service_type',
|
|
default='object-store',
|
|
help=_('Swift service type.'),
|
|
deprecated_for_removal=True,
|
|
deprecated_reason=_('Use [swift]/service_type option '
|
|
'to set specific service type')),
|
|
cfg.StrOpt('os_endpoint_type',
|
|
default='internalURL',
|
|
help=_('Swift endpoint type.'),
|
|
deprecated_for_removal=True,
|
|
deprecated_reason=_('Use [swift]/valid_interfaces option '
|
|
'to specify endpoint interfaces.')),
|
|
cfg.StrOpt('os_region',
|
|
help=_('Keystone region to get endpoint for.'),
|
|
deprecated_for_removal=True,
|
|
deprecated_reason=_("Use [swift]/region_name option to "
|
|
"configure region."))
|
|
]
|
|
|
|
|
|
def register_opts(conf):
|
|
conf.register_opts(_OPTS, SWIFT_GROUP)
|
|
keystone.register_auth_opts(SWIFT_GROUP, SERVICE_TYPE)
|
|
|
|
|
|
def list_opts():
|
|
return keystone.add_auth_options(_OPTS, SERVICE_TYPE)
|