Fix double "host" option.
Remove the "host" option from the netconf.py because it's conflicting with the "host" option specified in the common/service.py. Change-Id: Id3cb558626c6f4206143648e313586b1ff9de1e9
This commit is contained in:
parent
acb05d4018
commit
ae832fe8cf
@ -46,13 +46,6 @@ netconf_opts = [
|
|||||||
cfg.StrOpt('my_ip',
|
cfg.StrOpt('my_ip',
|
||||||
default=_get_my_ip(),
|
default=_get_my_ip(),
|
||||||
help='ip address of this host'),
|
help='ip address of this host'),
|
||||||
cfg.StrOpt('host',
|
|
||||||
default=socket.gethostname(),
|
|
||||||
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('use_ipv6',
|
cfg.BoolOpt('use_ipv6',
|
||||||
default=False,
|
default=False,
|
||||||
help='use ipv6'),
|
help='use ipv6'),
|
||||||
|
@ -23,7 +23,7 @@ from ironic.common import config
|
|||||||
|
|
||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
CONF.import_opt('use_ipv6', 'ironic.netconf')
|
CONF.import_opt('use_ipv6', 'ironic.netconf')
|
||||||
CONF.import_opt('host', 'ironic.netconf')
|
CONF.import_opt('host', 'ironic.common.service')
|
||||||
|
|
||||||
|
|
||||||
class ConfFixture(fixtures.Fixture):
|
class ConfFixture(fixtures.Fixture):
|
||||||
|
Loading…
Reference in New Issue
Block a user