diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-20 02:21:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-20 02:21:54 +0000 |
| commit | 2924c3efb6f6003dd49951dd78bdb44bae2ee367 (patch) | |
| tree | 2b04a25bd36b685f2b4a2dbc8f686a3703839774 /etc/ironic/ironic.conf.sample | |
| parent | 435328e54f1da43f75b53f5c3a2c33f6a22bdb85 (diff) | |
| parent | ba53acb279e21b8644363bfaa7242ed6517c87c5 (diff) | |
| download | ironic-2924c3efb6f6003dd49951dd78bdb44bae2ee367.tar.gz | |
Merge "Finalize migration to keystoneauth adapters"
Diffstat (limited to 'etc/ironic/ironic.conf.sample')
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index eb47e9329..0d54a145c 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -2221,8 +2221,14 @@ # From ironic # -# The region used for getting endpoints of OpenStack services. -# (string value) +# DEPRECATED: The region used for getting endpoints of +# OpenStack services. (string value) +# This option is deprecated for removal. +# Its value may be silently ignored in the future. +# Reason: Use 'region_name' option in the following sections - +# '[service_catalog]', '[neutron]', '[glance]', '[cinder]', +# '[swift]' and '[inspector]' to configure region for those +# services individually. #region_name = <None> @@ -2646,7 +2652,9 @@ #domain_name = <None> # Always use this endpoint URL for requests for this client. -# (string value) +# NOTE: The unversioned endpoint should be specified here; to +# request a particular API version, use the `version`, `min- +# version`, and/or `max-version` options. (string value) #endpoint_override = <None> # Verify HTTPS connections. (boolean value) @@ -2739,16 +2747,16 @@ # Its value may be silently ignored in the future. # Reason: Use [neutron]/endpoint_override option instead. It # has no default value and must be set explicitly if required -# to connect to specific neutron URL, for example when -# [neutron]auth_strategy is noauth. +# to connect to specific neutron URL, for example in stand +# alone mode when [neutron]/auth_type is 'none'. #url = <None> # DEPRECATED: Timeout value for connecting to neutron in # seconds. (integer value) # This option is deprecated for removal. # Its value may be silently ignored in the future. -# Reason: Use [neutron]/timeout option instead. It has no -# default value and must be set explicitly. +# Reason: Set the desired value explicitly using the +# [neutron]/timeout option instead. #url_timeout = 30 # User's domain id (string value) @@ -4060,7 +4068,9 @@ #domain_name = <None> # Always use this endpoint URL for requests for this client. -# (string value) +# NOTE: The unversioned endpoint should be specified here; to +# request a particular API version, use the `version`, `min- +# version`, and/or `max-version` options. (string value) #endpoint_override = <None> # Verify HTTPS connections. (boolean value) |