Merge "Use PortOpt instead of min/max on IntOpt"
This commit is contained in:
commit
5f5c8a6456
|
@ -295,10 +295,9 @@ nsxv_opts = [
|
|||
'metadata proxy')),
|
||||
cfg.ListOpt('nova_metadata_ips',
|
||||
help=_('IP addresses used by Nova metadata service')),
|
||||
cfg.IntOpt('nova_metadata_port',
|
||||
default=8775,
|
||||
min=1, max=65535,
|
||||
help=_("TCP Port used by Nova metadata server")),
|
||||
cfg.PortOpt('nova_metadata_port',
|
||||
default=8775,
|
||||
help=_("TCP Port used by Nova metadata server")),
|
||||
cfg.StrOpt('metadata_shared_secret',
|
||||
secret=True,
|
||||
help=_('Shared secret to sign metadata requests')),
|
||||
|
|
|
@ -54,11 +54,10 @@ metadata_opts = [
|
|||
deprecated_group='NVP_METADATA',
|
||||
default='127.0.0.1',
|
||||
help=_("IP address used by Metadata server.")),
|
||||
cfg.IntOpt('metadata_server_port',
|
||||
deprecated_group='NVP_METADATA',
|
||||
default=8775,
|
||||
min=1, max=65535,
|
||||
help=_("TCP Port used by Metadata server.")),
|
||||
cfg.PortOpt('metadata_server_port',
|
||||
deprecated_group='NVP_METADATA',
|
||||
default=8775,
|
||||
help=_("TCP Port used by Metadata server.")),
|
||||
cfg.StrOpt('metadata_shared_secret',
|
||||
deprecated_group='NVP_METADATA',
|
||||
default='',
|
||||
|
|
|
@ -19,8 +19,8 @@ dvs_opts = [
|
|||
cfg.StrOpt('host_ip',
|
||||
help='Hostname or IP address for connection to VMware vCenter '
|
||||
'host.'),
|
||||
cfg.IntOpt('host_port', default=443, min=1, max=65535,
|
||||
help='Port for connection to VMware vCenter host.'),
|
||||
cfg.PortOpt('host_port', default=443,
|
||||
help='Port for connection to VMware vCenter host.'),
|
||||
cfg.StrOpt('host_username',
|
||||
help='Username for connection to VMware vCenter host.'),
|
||||
cfg.StrOpt('host_password',
|
||||
|
|
Loading…
Reference in New Issue