Merge "Add drac_address to ipmi_address_fields"

This commit is contained in:
Jenkins 2016-12-16 18:32:39 +00:00 committed by Gerrit Code Review
commit 4a68327e40
2 changed files with 3 additions and 2 deletions

View File

@ -64,7 +64,7 @@
# Ironic driver_info fields that are equivalent to ipmi_address. (list
# value)
#ipmi_address_fields = ilo_address,drac_host,cimc_address
#ipmi_address_fields = ilo_address,drac_host,drac_address,cimc_address
# Path to the rootwrap configuration file to use for running commands
# as root (string value)

View File

@ -208,7 +208,8 @@ SERVICE_OPTS = [
'expression will be affected by introspection_delay '
'setting.')),
cfg.ListOpt('ipmi_address_fields',
default=['ilo_address', 'drac_host', 'cimc_address'],
default=['ilo_address', 'drac_host', 'drac_address',
'cimc_address'],
help=_('Ironic driver_info fields that are equivalent '
'to ipmi_address.')),
cfg.StrOpt('rootwrap_config',