Support interface name map for Dell LLDP switch port workaround

The current implementation only works if all compute nodes in the system
have the same interface name for their provisioning network. This change
adds a default value and a map for exceptions
This commit is contained in:
Mark Goddard 2017-06-15 14:52:23 +01:00
parent c0cf1c9b74
commit 4c9a6da3f1
3 changed files with 15 additions and 7 deletions

View File

@ -58,9 +58,13 @@ inspector_ipmi_username: "{{ ipmi_username }}"
# Ironic inspector IPMI password to set.
inspector_ipmi_password: "{{ ipmi_password }}"
# Ironic inspector network interface name on which to check for an LLDP switch
# port description to use as the node's name.
inspector_lldp_switch_port_interface:
# Ironic inspector default network interface name on which to check for an LLDP
# switch port description to use as the node's name.
inspector_lldp_switch_port_interface_default:
# Ironic inspector map from hostname to network interface name on which to
# check for an LLDP switch port description to use as the node's name.
inspector_lldp_switch_port_interface_map: {}
###############################################################################
# Ironic inspector introspection rules configuration.

View File

@ -53,7 +53,7 @@
- action: "set-attribute"
path: "name"
value: "{{ item.1.1.description }}"
inspector_rule_var_lldp_switch_port_interface: "{{ inspector_lldp_switch_port_interface }}"
inspector_rule_var_lldp_switch_port_interface: "{{ inspector_lldp_switch_port_interface_map.get(item.1.1.description, inspector_lldp_switch_port_interface_default) }}"
pre_tasks:
- name: Validate OpenStack password authentication parameters

View File

@ -45,9 +45,13 @@
# Ironic inspector IPMI password to set.
#inspector_ipmi_password:
# Ironic inspector network interface name on which to check for an LLDP switch
# port description to use as the node's name.
#inspector_lldp_switch_port_interface:
# Ironic inspector default network interface name on which to check for an LLDP
# switch port description to use as the node's name.
#inspector_lldp_switch_port_interface_default:
# Ironic inspector map from hostname to network interface name on which to
# check for an LLDP switch port description to use as the node's name.
#inspector_lldp_switch_port_interface_map:
###############################################################################
# Ironic inspector introspection rules configuration.