From fb70e05ae9cd33d74122460dff073251afac9db0 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Thu, 6 Oct 2016 14:22:25 +0300 Subject: Cleanup unused (i)PXE kernel parameters Bash ramdisk is long deprecated already, but its options are still passed over as kernel parameters in boot config templates. This patch removes all options that are no longer used by IPA-based ramdisk. List of removed kernel parameters: - deployment_id, deployment_key, ironic_api_url, iscsi_target_iqn: used only in bash ramdisk - boot_option, boot_mode, disk: now are either auto-discovered by IPA or fetched from node - root_device: passing root device hints to IPA as kernel parameter was deprecated in Newton. With this change, usage of root device hints with ramdisks containing IPA of Mitaka release or older will not be possible. Change-Id: I5e434bf0cc7819cf003c29f01e822a8fbde034c8 Closes-Bug: #1630799 --- ironic/tests/unit/drivers/pxe_config.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ironic/tests/unit/drivers/pxe_config.template') diff --git a/ironic/tests/unit/drivers/pxe_config.template b/ironic/tests/unit/drivers/pxe_config.template index 6bbc9afc5..baa9c9f7d 100644 --- a/ironic/tests/unit/drivers/pxe_config.template +++ b/ironic/tests/unit/drivers/pxe_config.template @@ -2,7 +2,7 @@ default deploy label deploy kernel /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_kernel -append initrd=/tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_ramdisk selinux=0 disk=cciss/c0d0,sda,hda,vda iscsi_target_iqn=iqn-1be26c0b-03f2-4d2e-ae87-c02d7f33c123 deployment_id=1be26c0b-03f2-4d2e-ae87-c02d7f33c123 deployment_key=0123456789ABCDEFGHIJKLMNOPQRSTUV ironic_api_url=http://192.168.122.184:6385 troubleshoot=0 text test_param boot_option=netboot root_device=vendor=fake,size=123 ipa-api-url=http://192.168.122.184:6385 ipa-driver-name=pxe_ssh boot_mode=bios coreos.configdrive=0 +append initrd=/tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_ramdisk selinux=0 troubleshoot=0 text test_param ipa-api-url=http://192.168.122.184:6385 ipa-driver-name=pxe_ssh coreos.configdrive=0 ipappend 3 -- cgit v1.2.1