openstack
/
ironic
Code Issues Proposed changes

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:
Devananda van der Veen 2013-05-21 18:25:33 -07:00
parent acb05d4018
commit ae832fe8cf
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ironic/netconf.py
View File

@ -46,13 +46,6 @@ netconf_opts = [
cfg.StrOpt('my_ip',
default=_get_my_ip(),
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',
default=False,
help='use ipv6'),

2
ironic/tests/conf_fixture.py
View File

@ -23,7 +23,7 @@ from ironic.common import config
CONF = cfg.CONF
CONF.import_opt('use_ipv6', 'ironic.netconf')
CONF.import_opt('host', 'ironic.netconf')
CONF.import_opt('host', 'ironic.common.service')
class ConfFixture(fixtures.Fixture):