diff options
| author | Pavlo Shchelokovskyy <shchelokovskyy@gmail.com> | 2017-11-06 14:00:57 +0000 |
|---|---|---|
| committer | Pavlo Shchelokovskyy <shchelokovskyy@gmail.com> | 2017-11-07 09:59:48 +0000 |
| commit | 44b78219e8f57b2e68e61c2cb36c729a59046217 (patch) | |
| tree | 1e17ce81813da40112fe5cda9fa9a09ea0b7652c /etc | |
| parent | 10f8ff5b480a451796d6ab9ecb5236c3a27a74fa (diff) | |
| download | ironic-44b78219e8f57b2e68e61c2cb36c729a59046217.tar.gz | |
Remove some deprecated glance options
glance_host, glance_port and glance_protocol options in [glance]
config section were deprecated during Pike and can be removed already.
Change-Id: I93739a17cfaf1cee5fa23f3fc24325d63f68aa74
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 030d1c493..515d078d1 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -1541,9 +1541,9 @@ # A list of the glance api servers available to ironic. Prefix # with https:// for SSL-based glance API servers. Format is -# [hostname|IP]:port. If neither this option nor glance_host -# is set, the service catalog is used. It is recommended to -# rely on the service catalog, if possible. (list value) +# [hostname|IP]:port. If this option is not set, the service +# catalog is used. It is recommended to rely on the service +# catalog, if possible. (list value) #glance_api_servers = <None> # DEPRECATED: Glance API version (1 or 2) to use. (integer @@ -1561,33 +1561,10 @@ # when glance_api_insecure is set to False. (string value) #glance_cafile = <None> -# DEPRECATED: Default glance hostname or IP address. The -# service catalog is used when not defined. Deprecated, use -# glance_api_servers instead. (string value) -# This option is deprecated for removal. -# Its value may be silently ignored in the future. -#glance_host = <None> - # Number of retries when downloading an image from glance. # (integer value) #glance_num_retries = 0 -# DEPRECATED: Default glance port. Deprecated, use -# glance_api_servers instead. (port value) -# Minimum value: 0 -# Maximum value: 65535 -# This option is deprecated for removal. -# Its value may be silently ignored in the future. -#glance_port = 9292 - -# DEPRECATED: Default protocol to use when connecting to -# glance. Set to https for SSL. Deprecated, use -# glance_api_services instead. (string value) -# Allowed values: http, https -# This option is deprecated for removal. -# Its value may be silently ignored in the future. -#glance_protocol = http - # Verify HTTPS connections. (boolean value) #insecure = false |