diff --git a/ansible/group_vars/all/ironic b/ansible/group_vars/all/ironic index 64f791267..643c85d38 100644 --- a/ansible/group_vars/all/ironic +++ b/ansible/group_vars/all/ironic @@ -82,6 +82,15 @@ kolla_ironic_enabled_raid_interfaces: # raid_interface field set. kolla_ironic_default_raid_interface: no-raid +# Specify the list of rescue interfaces to load during service initialization. +kolla_ironic_enabled_rescue_interfaces: + - agent + - no-rescue + +# Default rescue interface to be used for nodes that do not have +# rescue_interface field set. +kolla_ironic_default_rescue_interface: no-rescue + # Specify the list of storage interfaces to load during # service initialization. #kolla_ironic_enabled_storage_interfaces: diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml index 7989ce4ae..2b3a9909f 100644 --- a/ansible/roles/kolla-openstack/defaults/main.yml +++ b/ansible/roles/kolla-openstack/defaults/main.yml @@ -124,6 +124,13 @@ kolla_ironic_enabled_raid_interfaces: [] # raid_interface field set. kolla_ironic_default_raid_interface: +# Specify the list of rescue interfaces to load during service initialization. +kolla_ironic_enabled_rescue_interfaces: [] + +# Default rescue interface to be used for nodes that do not have +# rescue_interface field set. +kolla_ironic_default_rescue_interface: + # Specify the list of storage interfaces to load during # service initialization. kolla_ironic_enabled_storage_interfaces: [] diff --git a/ansible/roles/kolla-openstack/templates/ironic.conf.j2 b/ansible/roles/kolla-openstack/templates/ironic.conf.j2 index 0994215dd..03e9310e9 100644 --- a/ansible/roles/kolla-openstack/templates/ironic.conf.j2 +++ b/ansible/roles/kolla-openstack/templates/ironic.conf.j2 @@ -9,7 +9,7 @@ enabled_hardware_types: {{ kolla_ironic_enabled_hardware_types | join(',') }} {# Add configuration of enabled and default dynamic driver interfaces. #} {% set interfaces=['boot', 'console', 'deploy', 'inspect', 'management', - 'network', 'power', 'raid', 'storage', 'vendor'] %} + 'network', 'power', 'raid', 'rescue', 'storage', 'vendor'] %} {% for interface in interfaces %} {% if hostvars[inventory_hostname]['kolla_ironic_enabled_' ~ interface ~ '_interfaces'] | default %} {{ 'enabled_' ~ interface ~ '_interfaces' }} = {{ hostvars[inventory_hostname]['kolla_ironic_enabled_' ~ interface ~ '_interfaces'] | join(',') }} diff --git a/etc/kayobe/ironic.yml b/etc/kayobe/ironic.yml index 59f1d3e37..0ee05b6cc 100644 --- a/etc/kayobe/ironic.yml +++ b/etc/kayobe/ironic.yml @@ -65,6 +65,13 @@ # raid_interface field set. #kolla_ironic_default_raid_interface: +# Specify the list of rescue interfaces to load during service initialization. +#kolla_ironic_enabled_rescue_interfaces: + +# Default rescue interface to be used for nodes that do not have +# rescue_interface field set. +#kolla_ironic_default_rescue_interface: + # Specify the list of storage interfaces to load during # service initialization. #kolla_ironic_enabled_storage_interfaces: