deprecate old glance config options
This deprecates the glance host, port, protocol options in nova. api_servers is now the preferred way to do this. Change-Id: I9054bcfb7f5a4a31f0bbfd770c00c767f3d165ba
This commit is contained in:
parent
451b2e040f
commit
26262b7943
@ -45,21 +45,29 @@ import nova.image.download as image_xfers
|
|||||||
glance_opts = [
|
glance_opts = [
|
||||||
cfg.StrOpt('host',
|
cfg.StrOpt('host',
|
||||||
default='$my_ip',
|
default='$my_ip',
|
||||||
help='Default glance hostname or IP address'),
|
# TODO(sdague): remove in N
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
help='Glance server hostname or IP address'),
|
||||||
cfg.IntOpt('port',
|
cfg.IntOpt('port',
|
||||||
default=9292,
|
default=9292,
|
||||||
min=1,
|
min=1,
|
||||||
max=65535,
|
max=65535,
|
||||||
help='Default glance port'),
|
# TODO(sdague): remove in N
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
help='Glance server port'),
|
||||||
cfg.StrOpt('protocol',
|
cfg.StrOpt('protocol',
|
||||||
default='http',
|
default='http',
|
||||||
choices=('http', 'https'),
|
choices=('http', 'https'),
|
||||||
help='Default protocol to use when connecting to glance. '
|
# TODO(sdague): remove in N
|
||||||
|
deprecated_for_removal=True,
|
||||||
|
help='Protocol to use when connecting to glance. '
|
||||||
'Set to https for SSL.'),
|
'Set to https for SSL.'),
|
||||||
cfg.ListOpt('api_servers',
|
cfg.ListOpt('api_servers',
|
||||||
help='A list of the glance api servers available to nova. '
|
help='''
|
||||||
'Prefix with https:// for ssl-based glance api servers. '
|
A list of the glance api servers endpoints available to nova. These
|
||||||
'([hostname|ip]:port)'),
|
should be fully qualified urls of the form
|
||||||
|
"scheme://hostname:port[/path]" (i.e. "http://10.0.1.0:9292" or
|
||||||
|
"https://my.glance.server/image")'''),
|
||||||
cfg.BoolOpt('api_insecure',
|
cfg.BoolOpt('api_insecure',
|
||||||
default=False,
|
default=False,
|
||||||
help='Allow to perform insecure SSL (https) requests to '
|
help='Allow to perform insecure SSL (https) requests to '
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
|
||||||
|
- The host, port, and protocol options in the [glance] configuration
|
||||||
|
section are deprecated, and will be removed in the N release. The
|
||||||
|
api_servers value should be used instead.
|
Loading…
Reference in New Issue
Block a user