From 208088186b4fa899777f8c1b1cb9b505f83fb479 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Thu, 15 Dec 2016 16:34:31 +0200 Subject: [PATCH] Add drac_address to ipmi_address_fields Since Ia23e8582a398dca9ca11762ee6fe1789fdba9777 ironic's DRAC drivers deprecated 'drac_host' driver_info field in favor of 'drac_address'. This patch adds 'drac_address' to default value for 'ipmi_address_fields' config option so that inspector can support both nodes with old and new driver_info field. Change-Id: I90559d7a99462cd0de2a0c8ce047015955b8cfda Related-Bug: #1644210 --- example.conf | 2 +- ironic_inspector/conf.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/example.conf b/example.conf index 102b28fc0..3de199078 100644 --- a/example.conf +++ b/example.conf @@ -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) diff --git a/ironic_inspector/conf.py b/ironic_inspector/conf.py index bde68ba12..30e15765e 100644 --- a/ironic_inspector/conf.py +++ b/ironic_inspector/conf.py @@ -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',