Merge "Use HostAddressOpt for opts that accept IP and hostnames"

This commit is contained in:
Jenkins 2017-05-22 05:20:07 +00:00 committed by Gerrit Code Review
commit 5f4930fad2
1 changed files with 11 additions and 11 deletions

View File

@ -19,12 +19,12 @@ from oslo_log import log as logging
cli_opts = [
cfg.StrOpt('host', default='0.0.0.0',
help='Name of this node. This can be an opaque identifier. '
'It is not necessarily a hostname, FQDN, or IP address. '
'However, the node name must be valid within '
'an AMQP key, and if using ZeroMQ, a valid '
'hostname, FQDN, or IP address'),
cfg.HostAddressOpt('host', default='0.0.0.0',
help='Name of this node. This can be an opaque '
'identifier. It is not necessarily a hostname, '
'FQDN, or IP address. However, the node name must '
'be valid within an AMQP key, and if using '
'ZeroMQ, a valid hostname, FQDN, or IP address'),
cfg.BoolOpt('log_exchange', default=False,
help='Log request/response exchange details: environ, '
'headers and bodies'),
@ -33,11 +33,11 @@ cli_opts = [
os_opts = [
cfg.StrOpt('os_auth_protocol',
default='http',
help='Protocol used to access OpenStack Identity service.'),
cfg.StrOpt('os_auth_host',
default='127.0.0.1',
help='IP or hostname of machine on which OpenStack Identity '
'service is located.'),
help='Protocol used to access OpenStack Identity service'),
cfg.HostAddressOpt('os_auth_host',
default='127.0.0.1',
help='IP or hostname of machine on which OpenStack '
'Identity service is located'),
cfg.StrOpt('os_auth_port',
default='35357',
help='Port of OpenStack Identity service.'),