openstack/kayobe
Code Issues Proposed changes

Add configuration for ironic enable and default rescue interfaces

Browse Source 
The rescue interface was added in the Queens release.
This commit is contained in:
Mark Goddard 2018-01-30 19:02:17 +00:00
parent 1993301e34
commit b32d9e404f
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/group_vars/all/ironic
View File

@ -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:

7
ansible/roles/kolla-openstack/defaults/main.yml
View File

@ -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: []

2
ansible/roles/kolla-openstack/templates/ironic.conf.j2
View File

@ -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(',') }}

7
etc/kayobe/ironic.yml
View File

@ -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: