Remove legacy Ironic driver references

From Rocky, Ironic no longer supports drivers, in favour of hardware
types. Hardware types were already implemented for the overcloud Ironic,
this change ensures that Bifrost configuration is given hardware types
where necessary.

Change-Id: Iea91d2cd88b7566bb9cad20367ec64b9213d8845
This commit is contained in:
Will Miller 2018-08-03 14:47:47 +00:00 committed by Mark Goddard
parent 60ecee2b25
commit d253ca87f2
9 changed files with 21 additions and 39 deletions

View File

@ -38,8 +38,9 @@ kolla_bifrost_dib_packages: []
############################################################################### ###############################################################################
# Ironic configuration. # Ironic configuration.
# Whether to enable ipmitool-based drivers. # List of hardware types to enable for Bifrost's Ironic.
kolla_bifrost_enable_ipmitool_drivers: true kolla_bifrost_enabled_hardware_types:
- ipmi
############################################################################### ###############################################################################
# Ironic Inspector configuration. # Ironic Inspector configuration.

View File

@ -2,11 +2,6 @@
############################################################################### ###############################################################################
# Ironic configuration. # Ironic configuration.
# List of enabled Ironic drivers.
kolla_ironic_drivers:
- agent_ipmitool
- pxe_ipmitool
# Specify the list of hardware types to load during service initialization. # Specify the list of hardware types to load during service initialization.
kolla_ironic_enabled_hardware_types: kolla_ironic_enabled_hardware_types:
- ipmi - ipmi

View File

@ -5,8 +5,6 @@
- kolla-bifrost - kolla-bifrost
vars: vars:
kolla_bifrost_extra_globals_path: "{{ kayobe_config_path ~ '/kolla/config/bifrost/bifrost.yml' }}" kolla_bifrost_extra_globals_path: "{{ kayobe_config_path ~ '/kolla/config/bifrost/bifrost.yml' }}"
kolla_bifrost_driver_map:
- { name: agent_ipmitool, enabled: "{{ kolla_bifrost_enable_ipmitool_drivers | bool }}" }
pre_tasks: pre_tasks:
- name: Check whether a Kolla Bifrost extra globals configuration file exists - name: Check whether a Kolla Bifrost extra globals configuration file exists
@ -25,11 +23,6 @@
roles: roles:
- role: kolla-bifrost - role: kolla-bifrost
# Generate a list of enabled drivers from the map.
kolla_bifrost_enabled_drivers: >
{{ kolla_bifrost_driver_map | selectattr('enabled') | map(attribute='name') | list }}
kolla_bifrost_enable_pxe_drivers: false
# Network configuration. # Network configuration.
kolla_bifrost_dhcp_pool_start: "{{ provision_oc_net_name | net_inspection_allocation_pool_start }}" kolla_bifrost_dhcp_pool_start: "{{ provision_oc_net_name | net_inspection_allocation_pool_start }}"
kolla_bifrost_dhcp_pool_end: "{{ provision_oc_net_name | net_inspection_allocation_pool_end }}" kolla_bifrost_dhcp_pool_end: "{{ provision_oc_net_name | net_inspection_allocation_pool_end }}"

View File

@ -20,14 +20,8 @@ kolla_bifrost_dib_env_vars: {}
# List of DIB image packages. # List of DIB image packages.
kolla_bifrost_dib_packages: [] kolla_bifrost_dib_packages: []
# List of Ironic drivers to enable. # List of hardware types to enable for Bifrost's Ironic.
kolla_bifrost_enabled_drivers: [] kolla_bifrost_enabled_hardware_types: []
# Whether to enable the Ironic PXE drivers.
kolla_bifrost_enable_pxe_drivers: false
# List of Ironic PXE drivers to enable if kolla_bifrost_enable_pxe_drivers.
kolla_bifrost_pxe_drivers: []
# IP address range for DHCP. # IP address range for DHCP.
kolla_bifrost_dhcp_pool_start: kolla_bifrost_dhcp_pool_start:

View File

@ -1,12 +1,6 @@
--- ---
# List of enabled Ironic drivers. # List of enabled Ironic hardware types.
enabled_drivers: "{{ kolla_bifrost_enabled_drivers | join(',') }}" enabled_hardware_types: "{{ kolla_bifrost_enabled_hardware_types | join(',') }}"
# Whether to enable legacy PXE/iscsi drivers.
enable_pxe_drivers: {{ kolla_bifrost_enable_pxe_drivers | bool }}
# List of legacy PXE/iscsi drivers to enable.
pxe_drivers: "{{ kolla_bifrost_pxe_drivers | join(',') }}"
# IP address range for DHCP. # IP address range for DHCP.
dhcp_pool_start: "{{ kolla_bifrost_dhcp_pool_start }}" dhcp_pool_start: "{{ kolla_bifrost_dhcp_pool_start }}"

View File

@ -1,11 +1,7 @@
# {{ ansible_managed }} # {{ ansible_managed }}
[DEFAULT] [DEFAULT]
enabled_drivers = {{ kolla_ironic_drivers | join(',') }}
{% if kolla_ironic_enabled_hardware_types %}
enabled_hardware_types: {{ kolla_ironic_enabled_hardware_types | join(',') }} enabled_hardware_types: {{ kolla_ironic_enabled_hardware_types | join(',') }}
{% endif %}
{# Add configuration of enabled and default dynamic driver interfaces. #} {# Add configuration of enabled and default dynamic driver interfaces. #}
{% set interfaces=['boot', 'console', 'deploy', 'inspect', 'management', {% set interfaces=['boot', 'console', 'deploy', 'inspect', 'management',

View File

@ -34,8 +34,8 @@
############################################################################### ###############################################################################
# Ironic configuration. # Ironic configuration.
# Whether to enable ipmitool-based drivers. # List of hardware types to enable for Bifrost's Ironic.
#kolla_bifrost_enable_ipmitool_drivers: #kolla_bifrost_enabled_hardware_types:
############################################################################### ###############################################################################
# Ironic Inspector configuration. # Ironic Inspector configuration.

View File

@ -2,9 +2,6 @@
############################################################################### ###############################################################################
# Ironic configuration. # Ironic configuration.
# List of enabled Ironic drivers.
#kolla_ironic_drivers:
# Specify the list of hardware types to load during service initialization. # Specify the list of hardware types to load during service initialization.
#kolla_ironic_enabled_hardware_types: #kolla_ironic_enabled_hardware_types:

View File

@ -0,0 +1,12 @@
---
upgrade:
- |
Overcloud Ironic must now be configured with the variable
``kolla_ironic_enabled_hardware_types``; ``kolla_ironic_drivers`` has been
removed.
- |
Bifrost's ``kolla_bifrost_enable_ipmitool_drivers`` and
``kolla_bifrost_enable_pxe_drivers`` variables have been removed. Bifrost
must now be configured by setting the variable
``kolla_bifrost_enabled_hardware_types`` to be a list of hardware types to
enable.