Pavlo Shchelokovskyy
9ee28252a4
in the change I52f1386df45ebe0a43b11fe1583e012dfa3af532 we lost most of swiftclient options in a belief that those are handled by the keystoneauth session passed to the swiftclient. In fact though, swiftclient only uses this session to get itself an endpoint and a token, but it has no SessionClient, and does not use that passed in session to make further requests to swift itself. This patch restores all the logic that we had to decompose the session object loaded from config to options that are passed to swiftclient explicitly. Change-Id: I08f382aa9d2ad22f7dbd65f7b54a8dd0a765ba44 Partial-Bug: #1699547 Closes-Bug: #1736158
37 lines
1.2 KiB
Python
37 lines
1.2 KiB
Python
# Copyright 2016 Intel Corporation
|
|
# Copyright 2014 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.
|
|
|
|
from oslo_config import cfg
|
|
|
|
from ironic.common.i18n import _
|
|
from ironic.conf import auth
|
|
|
|
opts = [
|
|
cfg.IntOpt('swift_max_retries',
|
|
default=2,
|
|
help=_('Maximum number of times to retry a Swift request, '
|
|
'before failing.'))
|
|
]
|
|
|
|
|
|
def register_opts(conf):
|
|
conf.register_opts(opts, group='swift')
|
|
auth.register_auth_opts(conf, 'swift', service_type='object-store')
|
|
|
|
|
|
def list_opts():
|
|
return auth.add_auth_opts(opts, service_type='object-store')
|