summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Miller <willm@stackhpc.com>2018-08-03 14:47:47 +0000
committerMark Goddard <mark@stackhpc.com>2018-11-06 11:34:11 +0000
commitd253ca87f292c4eafb59b242aa95aa95028efbc8 (patch)
tree7e5629f9ce5aba134bb60be4620cf142f84c8a1b
parent60ecee2b253457a280ffd3b32f59df31dcefa21e (diff)
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
Notes
Notes (review): Code-Review+2: Doug Szumski <doug@stackhpc.com> Code-Review+2: Will Szumski <will@stackhpc.com> Workflow+1: Will Szumski <will@stackhpc.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 07 Nov 2018 11:54:21 +0000 Reviewed-on: https://review.openstack.org/588602 Project: openstack/kayobe Branch: refs/heads/master
-rw-r--r--ansible/group_vars/all/bifrost5
-rw-r--r--ansible/group_vars/all/ironic5
-rw-r--r--ansible/kolla-bifrost.yml7
-rw-r--r--ansible/roles/kolla-bifrost/defaults/main.yml10
-rw-r--r--ansible/roles/kolla-bifrost/templates/bifrost.yml.j210
-rw-r--r--ansible/roles/kolla-openstack/templates/ironic.conf.j24
-rw-r--r--etc/kayobe/bifrost.yml4
-rw-r--r--etc/kayobe/ironic.yml3
-rw-r--r--releasenotes/notes/remove-ironic-drivers-939a9c6afad33e2a.yaml12
9 files changed, 21 insertions, 39 deletions
diff --git a/ansible/group_vars/all/bifrost b/ansible/group_vars/all/bifrost
index 4aef1e3..cb7e1d8 100644
--- a/ansible/group_vars/all/bifrost
+++ b/ansible/group_vars/all/bifrost
@@ -38,8 +38,9 @@ kolla_bifrost_dib_packages: []
38############################################################################### 38###############################################################################
39# Ironic configuration. 39# Ironic configuration.
40 40
41# Whether to enable ipmitool-based drivers. 41# List of hardware types to enable for Bifrost's Ironic.
42kolla_bifrost_enable_ipmitool_drivers: true 42kolla_bifrost_enabled_hardware_types:
43 - ipmi
43 44
44############################################################################### 45###############################################################################
45# Ironic Inspector configuration. 46# Ironic Inspector configuration.
diff --git a/ansible/group_vars/all/ironic b/ansible/group_vars/all/ironic
index 8cc9400..f950b9c 100644
--- a/ansible/group_vars/all/ironic
+++ b/ansible/group_vars/all/ironic
@@ -2,11 +2,6 @@
2############################################################################### 2###############################################################################
3# Ironic configuration. 3# Ironic configuration.
4 4
5# List of enabled Ironic drivers.
6kolla_ironic_drivers:
7 - agent_ipmitool
8 - pxe_ipmitool
9
10# Specify the list of hardware types to load during service initialization. 5# Specify the list of hardware types to load during service initialization.
11kolla_ironic_enabled_hardware_types: 6kolla_ironic_enabled_hardware_types:
12 - ipmi 7 - ipmi
diff --git a/ansible/kolla-bifrost.yml b/ansible/kolla-bifrost.yml
index 1dfff09..2cc1c3c 100644
--- a/ansible/kolla-bifrost.yml
+++ b/ansible/kolla-bifrost.yml
@@ -5,8 +5,6 @@
5 - kolla-bifrost 5 - kolla-bifrost
6 vars: 6 vars:
7 kolla_bifrost_extra_globals_path: "{{ kayobe_config_path ~ '/kolla/config/bifrost/bifrost.yml' }}" 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 pre_tasks: 9 pre_tasks:
12 - name: Check whether a Kolla Bifrost extra globals configuration file exists 10 - name: Check whether a Kolla Bifrost extra globals configuration file exists
@@ -25,11 +23,6 @@
25 roles: 23 roles:
26 - role: kolla-bifrost 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 # Network configuration. 26 # Network configuration.
34 kolla_bifrost_dhcp_pool_start: "{{ provision_oc_net_name | net_inspection_allocation_pool_start }}" 27 kolla_bifrost_dhcp_pool_start: "{{ provision_oc_net_name | net_inspection_allocation_pool_start }}"
35 kolla_bifrost_dhcp_pool_end: "{{ provision_oc_net_name | net_inspection_allocation_pool_end }}" 28 kolla_bifrost_dhcp_pool_end: "{{ provision_oc_net_name | net_inspection_allocation_pool_end }}"
diff --git a/ansible/roles/kolla-bifrost/defaults/main.yml b/ansible/roles/kolla-bifrost/defaults/main.yml
index bdb78ae..de705ac 100644
--- a/ansible/roles/kolla-bifrost/defaults/main.yml
+++ b/ansible/roles/kolla-bifrost/defaults/main.yml
@@ -20,14 +20,8 @@ kolla_bifrost_dib_env_vars: {}
20# List of DIB image packages. 20# List of DIB image packages.
21kolla_bifrost_dib_packages: [] 21kolla_bifrost_dib_packages: []
22 22
23# List of Ironic drivers to enable. 23# List of hardware types to enable for Bifrost's Ironic.
24kolla_bifrost_enabled_drivers: [] 24kolla_bifrost_enabled_hardware_types: []
25
26# Whether to enable the Ironic PXE drivers.
27kolla_bifrost_enable_pxe_drivers: false
28
29# List of Ironic PXE drivers to enable if kolla_bifrost_enable_pxe_drivers.
30kolla_bifrost_pxe_drivers: []
31 25
32# IP address range for DHCP. 26# IP address range for DHCP.
33kolla_bifrost_dhcp_pool_start: 27kolla_bifrost_dhcp_pool_start:
diff --git a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2 b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
index 020de20..46c5fe2 100644
--- a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
+++ b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
@@ -1,12 +1,6 @@
1--- 1---
2# List of enabled Ironic drivers. 2# List of enabled Ironic hardware types.
3enabled_drivers: "{{ kolla_bifrost_enabled_drivers | join(',') }}" 3enabled_hardware_types: "{{ kolla_bifrost_enabled_hardware_types | join(',') }}"
4
5# Whether to enable legacy PXE/iscsi drivers.
6enable_pxe_drivers: {{ kolla_bifrost_enable_pxe_drivers | bool }}
7
8# List of legacy PXE/iscsi drivers to enable.
9pxe_drivers: "{{ kolla_bifrost_pxe_drivers | join(',') }}"
10 4
11# IP address range for DHCP. 5# IP address range for DHCP.
12dhcp_pool_start: "{{ kolla_bifrost_dhcp_pool_start }}" 6dhcp_pool_start: "{{ kolla_bifrost_dhcp_pool_start }}"
diff --git a/ansible/roles/kolla-openstack/templates/ironic.conf.j2 b/ansible/roles/kolla-openstack/templates/ironic.conf.j2
index 0b8bbd0..d589e20 100644
--- a/ansible/roles/kolla-openstack/templates/ironic.conf.j2
+++ b/ansible/roles/kolla-openstack/templates/ironic.conf.j2
@@ -1,11 +1,7 @@
1# {{ ansible_managed }} 1# {{ ansible_managed }}
2 2
3[DEFAULT] 3[DEFAULT]
4enabled_drivers = {{ kolla_ironic_drivers | join(',') }}
5
6{% if kolla_ironic_enabled_hardware_types %}
7enabled_hardware_types: {{ kolla_ironic_enabled_hardware_types | join(',') }} 4enabled_hardware_types: {{ kolla_ironic_enabled_hardware_types | join(',') }}
8{% endif %}
9 5
10{# Add configuration of enabled and default dynamic driver interfaces. #} 6{# Add configuration of enabled and default dynamic driver interfaces. #}
11{% set interfaces=['boot', 'console', 'deploy', 'inspect', 'management', 7{% set interfaces=['boot', 'console', 'deploy', 'inspect', 'management',
diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml
index ceffb27..271ebdc 100644
--- a/etc/kayobe/bifrost.yml
+++ b/etc/kayobe/bifrost.yml
@@ -34,8 +34,8 @@
34############################################################################### 34###############################################################################
35# Ironic configuration. 35# Ironic configuration.
36 36
37# Whether to enable ipmitool-based drivers. 37# List of hardware types to enable for Bifrost's Ironic.
38#kolla_bifrost_enable_ipmitool_drivers: 38#kolla_bifrost_enabled_hardware_types:
39 39
40############################################################################### 40###############################################################################
41# Ironic Inspector configuration. 41# Ironic Inspector configuration.
diff --git a/etc/kayobe/ironic.yml b/etc/kayobe/ironic.yml
index 0ee05b6..948cd34 100644
--- a/etc/kayobe/ironic.yml
+++ b/etc/kayobe/ironic.yml
@@ -2,9 +2,6 @@
2############################################################################### 2###############################################################################
3# Ironic configuration. 3# Ironic configuration.
4 4
5# List of enabled Ironic drivers.
6#kolla_ironic_drivers:
7
8# Specify the list of hardware types to load during service initialization. 5# Specify the list of hardware types to load during service initialization.
9#kolla_ironic_enabled_hardware_types: 6#kolla_ironic_enabled_hardware_types:
10 7
diff --git a/releasenotes/notes/remove-ironic-drivers-939a9c6afad33e2a.yaml b/releasenotes/notes/remove-ironic-drivers-939a9c6afad33e2a.yaml
new file mode 100644
index 0000000..419b5ee
--- /dev/null
+++ b/releasenotes/notes/remove-ironic-drivers-939a9c6afad33e2a.yaml
@@ -0,0 +1,12 @@
1---
2upgrade:
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.