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 /ironic/conf/glance.py | |
| 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 'ironic/conf/glance.py')
| -rw-r--r-- | ironic/conf/glance.py | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/ironic/conf/glance.py b/ironic/conf/glance.py index 0bbbfdbac..7d5393b65 100644 --- a/ironic/conf/glance.py +++ b/ironic/conf/glance.py @@ -103,28 +103,11 @@ opts = [ 'value between 1 and 32, a single-tenant store will use ' 'multiple containers to store images, and this value ' 'will determine how many containers are created.')), - cfg.StrOpt('glance_host', - help=_('Default glance hostname or IP address. The service ' - 'catalog is used when not defined. Deprecated, ' - 'use glance_api_servers instead.'), - deprecated_for_removal=True), - cfg.PortOpt('glance_port', - default=9292, - help=_('Default glance port. Deprecated, use ' - 'glance_api_servers instead.'), - deprecated_for_removal=True), - cfg.StrOpt('glance_protocol', - default='http', - choices=['http', 'https'], - help=_('Default protocol to use when connecting to glance. ' - 'Set to https for SSL. Deprecated, use ' - 'glance_api_services instead.'), - deprecated_for_removal=True), cfg.ListOpt('glance_api_servers', help=_('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 ' + 'servers. Format is [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.')), cfg.BoolOpt('glance_api_insecure', |