diff options
author | Pavlo Shchelokovskyy <shchelokovskyy@gmail.com> | 2017-06-21 07:48:04 +0000 |
---|---|---|
committer | Pavlo Shchelokovskyy <shchelokovskyy@gmail.com> | 2017-11-21 09:32:21 +0200 |
commit | 3e84bdb6db67856558aa8ed167721e5e6e2599e6 (patch) | |
tree | 97f12c15e3de2ea5a98bb0b75bea3aed3c386a55 /etc | |
parent | b9ebc7f121160aaa24b0a29f5e79822798e3480e (diff) | |
download | ironic-3e84bdb6db67856558aa8ed167721e5e6e2599e6.tar.gz |
Use adapters for cinderclient
deprecates the `[cinder]url` option in favor of
[cinder]endpoint_override.
Change-Id: Idd02e8cf0892965a3138479e49ec40cfeda7c96d
Partial-Bug: #1699547
Diffstat (limited to 'etc')
-rw-r--r-- | etc/ironic/ironic.conf.sample | 45 |
1 files changed, 43 insertions, 2 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index b32d0a6e7..99f1fed87 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -948,12 +948,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> @@ -971,10 +987,22 @@ # Deprecated group/name - [cinder]/tenant_name #project_name = <None> +# The default region_name for endpoint URL discovery. (string +# value) +#region_name = <None> + # Client retries in the case of a failed request connection. # (integer value) #retries = 3 +# 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 = volumev3 + # Tenant ID (string value) #tenant_id = <None> @@ -987,8 +1015,12 @@ # Trust ID (string value) #trust_id = <None> -# URL for connecting to cinder. If set, the value must start -# with either http:// or https://. (uri value) +# DEPRECATED: URL for connecting to cinder. If set, the value +# must start with either http:// or https://. (uri value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: Use [cinder]/endpoint_override option to set a +# specific cinder API url to connect to. #url = <None> # User's domain id (string value) @@ -1004,6 +1036,15 @@ # Deprecated group/name - [cinder]/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> + [cisco_ucs] |