diff options
| author | Pavlo Shchelokovskyy <shchelokovskyy@gmail.com> | 2017-06-29 09:03:18 +0000 |
|---|---|---|
| committer | Sam Betts <sam@code-smash.net> | 2017-12-06 14:14:29 +0000 |
| commit | 9ee28252a4ecb9b79676b2a00ea7b5c6c7e4c936 (patch) | |
| tree | 68e6f442fb861f41830cc382fc81ec46dc101789 /etc | |
| parent | 27ce77142bfb9ac56e85db37e0923a0eb47f2f7a (diff) | |
| download | ironic-9ee28252a4ecb9b79676b2a00ea7b5c6c7e4c936.tar.gz | |
Fix swiftclient creation
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
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index a384d7ec9..b8e00cfee 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -3894,12 +3894,28 @@ # Domain name to scope to (string value) #domain_name = <None> +# Always use this endpoint URL for requests for this client. +# (string value) +#endpoint_override = <None> + # Verify HTTPS connections. (boolean value) #insecure = false # PEM encoded client certificate key file (string value) #keyfile = <None> +# The maximum major version of a given API, intended to be +# used as the upper bound of a range with min_version. +# Mutually exclusive with version. (string value) +#max_version = <None> + +# The minimum major version of a given API, intended to be +# used as the lower bound of a range with max_version. +# Mutually exclusive with version. If min_version is given +# with no max_version it is as if max version is "latest". +# (string value) +#min_version = <None> + # User's password (string value) #password = <None> @@ -3917,6 +3933,18 @@ # Deprecated group/name - [swift]/tenant_name #project_name = <None> +# The default region_name for endpoint URL discovery. (string +# value) +#region_name = <None> + +# The default service_name for endpoint URL discovery. (string +# value) +#service_name = <None> + +# The default service_type for endpoint URL discovery. (string +# value) +#service_type = object-store + # Maximum number of times to retry a Swift request, before # failing. (integer value) #swift_max_retries = 2 @@ -3945,3 +3973,12 @@ # Username (string value) # Deprecated group/name - [swift]/user_name #username = <None> + +# List of interfaces, in order of preference, for endpoint +# URL. (list value) +#valid_interfaces = internal,public + +# Minimum Major API version within a given Major API version +# for endpoint URL discovery. Mutually exclusive with +# min_version and max_version (string value) +#version = <None> |