Browse Source

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
tags/5.0.0.0rc1
Will Miller 9 months ago
parent
commit
d253ca87f2

+ 3
- 2
ansible/group_vars/all/bifrost View File

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

+ 0
- 5
ansible/group_vars/all/ironic View File

@@ -2,11 +2,6 @@
2 2
 ###############################################################################
3 3
 # Ironic configuration.
4 4
 
5
-# List of enabled Ironic drivers.
6
-kolla_ironic_drivers:
7
-  - agent_ipmitool
8
-  - pxe_ipmitool
9
-
10 5
 # Specify the list of hardware types to load during service initialization.
11 6
 kolla_ironic_enabled_hardware_types:
12 7
   - ipmi

+ 0
- 7
ansible/kolla-bifrost.yml View File

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

+ 2
- 8
ansible/roles/kolla-bifrost/defaults/main.yml View File

@@ -20,14 +20,8 @@ kolla_bifrost_dib_env_vars: {}
20 20
 # List of DIB image packages.
21 21
 kolla_bifrost_dib_packages: []
22 22
 
23
-# List of Ironic drivers to enable.
24
-kolla_bifrost_enabled_drivers: []
25
-
26
-# Whether to enable the Ironic PXE drivers.
27
-kolla_bifrost_enable_pxe_drivers: false
28
-
29
-# List of Ironic PXE drivers to enable if kolla_bifrost_enable_pxe_drivers.
30
-kolla_bifrost_pxe_drivers: []
23
+# List of hardware types to enable for Bifrost's Ironic.
24
+kolla_bifrost_enabled_hardware_types: []
31 25
 
32 26
 # IP address range for DHCP.
33 27
 kolla_bifrost_dhcp_pool_start:

+ 2
- 8
ansible/roles/kolla-bifrost/templates/bifrost.yml.j2 View File

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

+ 0
- 4
ansible/roles/kolla-openstack/templates/ironic.conf.j2 View File

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

+ 2
- 2
etc/kayobe/bifrost.yml View File

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

+ 0
- 3
etc/kayobe/ironic.yml View File

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

+ 12
- 0
releasenotes/notes/remove-ironic-drivers-939a9c6afad33e2a.yaml View File

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

Loading…
Cancel
Save