diff --git a/playbooks/inventory/baremetal.csv.example b/playbooks/inventory/baremetal.csv.example index bc3e273f9..1259e9dc6 100644 --- a/playbooks/inventory/baremetal.csv.example +++ b/playbooks/inventory/baremetal.csv.example @@ -1,5 +1,5 @@ -00:1c:ab:8a:97:eb,root,undefined,192.168.122.1,1,8192,512,Control,VM,a8cb6624-0d9f-c882-affc-046ebb96ec01,hostname0,192.168.1.2,,,,,agent_ipmitool -00:2b:b7:65:83:19,root,undefined,192.168.122.1,1,8192,512,Control,VM,a8cb6624-0d9f-c882-affc-046ebb96ec02,hostname1,192.168.1.3,,,,,pxe_ipmitool +00:1c:ab:8a:97:eb,root,undefined,192.168.122.1,1,8192,512,Control,VM,a8cb6624-0d9f-c882-affc-046ebb96ec01,hostname0,192.168.1.2,,,,,ipmi +00:2b:b7:65:83:19,root,undefined,192.168.122.1,1,8192,512,Control,VM,a8cb6624-0d9f-c882-affc-046ebb96ec02,hostname1,192.168.1.3,,,,,ipmi 00:3a:ca:56:7d:2e,root,undefined,192.168.122.1,1,8192,512,Control,VM,a8cb6624-0d9f-c882-affc-046ebb96ec03,hostname2,192.168.1.4,,,, 00:4e:d5:45:6f:31,root,undefined,192.168.122.1,1,8192,512,SwiftStorage,VM,a8cb6624-0d9f-c882-affc-046ebb96ec04,hostname3,192.168.1.5,,,, 00:5a:ed:39:57:31,root,undefined,192.168.122.1,1,8192,512,SwiftStorage,VM,a8cb6624-0d9f-c882-affc-046ebb96ec05,hostname4,192.168.1.6,,,, diff --git a/playbooks/roles/bifrost-ironic-install/README.md b/playbooks/roles/bifrost-ironic-install/README.md index c72ecefe8..17ea5204c 100644 --- a/playbooks/roles/bifrost-ironic-install/README.md +++ b/playbooks/roles/bifrost-ironic-install/README.md @@ -90,13 +90,6 @@ which defaults to "ipmi, ilo, cisco-ucs-managed, cisco-ucs-standalone". Enabled interfaces can be set via the "enabled_boot_interfaces", "enabled_management_interfaces", and "enabled_power_interfaces" variables. -By default, PXE driver baseline support, in terms of installation of the -iSCSI client and configuration of sudoers and rootwrap configuration is -enabled. If you wish to disable this functionality, set -``enable_pxe_drivers`` to a value of ``false``. - -enable_pxe_drivers: false - In the event of an external DHCP server being used, the user will need to configure their DHCP server such that PXE, and iPXE chain loading occurs. For additional information for setting up DHCP in this scenario refer to diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index b489d3caf..a99eda5c3 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -97,13 +97,6 @@ enabled_boot_interfaces: "ilo-virtual-media,pxe" enabled_management_interfaces: "ilo,ipmitool,ucsm" enabled_power_interfaces: "ilo,ipmitool,ucsm" -# DEPRECATED: Ironic is removing classic drivers in Rocky. Please see -# enabled_hardware_types. -# Comma-separated list, in the format of a string, of drivers that are enabled -# by default. This is intended to be a list of agent based drivers. -# PXE drivers can be found in the setting pxe_drivers that can be found below. -enabled_drivers: "agent_ipmitool,agent_ilo,agent_ucs" - # DHCP pool for requests -- ignored if inventory_dhcp is set to True # since IP allocation will be static. dhcp_pool_start: 192.168.1.200 @@ -193,19 +186,6 @@ inspector: # download them on their own. download_ipxe: false - -# DEPRECATED: Please see enabled_hardware_types -# This enables installation of substrate for PXE driver support -enable_pxe_drivers: true - -# DEPRECATED: Please see enabled_hardware_types -# Comma-separated list of PXE drivers to enable when -# enable_pxe_drivers is set to true -pxe_drivers: "pxe_ipmitool,pxe_ilo" - - - - # Settings related to installing bifrost in a virtual environment enable_venv: false bifrost_venv_dir: "{{ lookup('env', 'VENV') | default('/opt/stack/bifrost') }}" diff --git a/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml b/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml index a2cba62ce..b10cce400 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml @@ -135,12 +135,12 @@ mode: 0644 owner: root group: root - when: skip_install is not defined and enable_pxe_drivers | bool == true + when: skip_install is not defined # Note(ashestakov): "copy" module in ansible doesn't support recursive # copying on remote host. "cp" command used instead. - name: "Copy rootwrap.d contents from ironic source folder" command: cp -r "{{ ironic_git_folder }}/etc/ironic/rootwrap.d/" "/etc/ironic/rootwrap.d" - when: skip_install is not defined and enable_pxe_drivers | bool == true + when: skip_install is not defined - name: "Populate keystone for Bifrost" include: keystone_setup.yml diff --git a/playbooks/roles/bifrost-ironic-install/tasks/install.yml b/playbooks/roles/bifrost-ironic-install/tasks/install.yml index 4305af98a..f8bc998d3 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml @@ -61,9 +61,10 @@ extra_args="-c {{ upper_constraints_file }}" when: skip_install is not defined +# TODO(dtantsur): only do this is the iscsi deploy interface is enabled - name: "Install iSCSI client if PXE driver support is enabled" action: "{{ ansible_pkg_mgr }} name={{ iscsi_client_package }} state=present" - when: skip_install is not defined and enable_pxe_drivers | bool == true + when: skip_install is not defined # NOTE(pas-ha) even when install into virtualenv is requested, # we need to install shade into system for enroll-dynamic to succeed diff --git a/playbooks/roles/bifrost-ironic-install/tasks/ironic_config.yml b/playbooks/roles/bifrost-ironic-install/tasks/ironic_config.yml index e204a030c..1896cf0f3 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/ironic_config.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/ironic_config.yml @@ -28,13 +28,6 @@ The configured network interface {{ network_interface }} does not have an IP address assigned when: not hostvars[inventory_hostname][provisioning_itf_name].get('ipv4', {}).get('address') -# DEPRECATED: enabled_drivers, pxe_drivers, and enable_pxe_drivers has -# been deprecated and will be removed in the Rocky release. Please consult -# enabled_hardware_types. -- name: "Update driver list if PXE drivers are enabled" - set_fact: - enabled_drivers: "{{ enabled_drivers }},{{ pxe_drivers }}" - when: enable_pxe_drivers | bool == true - name: "Create ironic config" template: src="ironic.conf.j2" @@ -42,9 +35,8 @@ owner=ironic group=ironic mode=0640 -- name: "Set sudoers for PXE driver support if enabled" +- name: "Set sudoers for rootwrap" lineinfile: dest: /etc/sudoers regexp: '^ironic(.*)/etc/ironic/rootwrap.conf(.*)' line: "ironic ALL = (root) NOPASSWD: {{ ironic_rootwrap_dir }}/ironic-rootwrap /etc/ironic/rootwrap.conf *" - when: enable_pxe_drivers | bool == true diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 index a68e641ef..cd8d326e7 100644 --- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 +++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 @@ -20,7 +20,6 @@ enabled_management_interfaces = {{ enabled_management_interfaces }} enabled_power_interfaces = {{ enabled_power_interfaces }} enabled_hardware_types = {{ enabled_hardware_types }} -enabled_drivers = {{ enabled_drivers }} rabbit_userid = ironic rabbit_password = {{ ironic_db_password }} diff --git a/playbooks/roles/ironic-enroll-dynamic/README.md b/playbooks/roles/ironic-enroll-dynamic/README.md index 4275d11e5..3d0104900 100644 --- a/playbooks/roles/ironic-enroll-dynamic/README.md +++ b/playbooks/roles/ironic-enroll-dynamic/README.md @@ -65,7 +65,7 @@ driver required. "mac": "00:01:02:03:04:05" }. ], - "driver": "agent_ipmitool", + "driver": "ipmi", "ip_address": "192.168.122.2", "properties": { "cpu_arch": "x86_64", diff --git a/releasenotes/notes/no-classic-drivers-0b8a346bcab8a004.yaml b/releasenotes/notes/no-classic-drivers-0b8a346bcab8a004.yaml new file mode 100644 index 000000000..5d4c67165 --- /dev/null +++ b/releasenotes/notes/no-classic-drivers-0b8a346bcab8a004.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The deprecated support for classic drivers has been removed.