openstack
/
ironic
Code Issues Proposed changes

Add troubleshoot option to PXE template 

Ported from nova: I169a5e3b7a9d80e18e389ae4645d2c5bbdae2a6f

Diskimage-builder recently added an optional troubleshoot parameter
which defaults to 0 (false). See I2cba8a9674075ba7e420027d40ef8cbe756cf07e

This commit adds the 'troubleshoot' option to the PXE template file
so it will be easier for people to find should they need to enable
troubleshooting mode.

Change-Id: I90d2389b5afa68407e2e68923a3486c7fd9f574e
This commit is contained in:
Lucas Alvares Gomes 2013-11-25 11:45:26 +00:00
parent e94e918589
commit 151fe20339
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/drivers/modules/pxe_config.template
View File

@ -2,7 +2,7 @@ default deploy
label deploy
kernel {{ pxe_options.deployment_aki_path }}
append initrd={{ pxe_options.deployment_ari_path }} selinux=0 disk=cciss/c0d0,sda,hda,vda iscsi_target_iqn={{ pxe_options.deployment_iscsi_iqn }} deployment_id={{ pxe_options.deployment_id }} deployment_key={{ pxe_options.deployment_key }} ironic_api_url={{ pxe_options.ironic_api_url }} {{ pxe_options.pxe_append_params|default("", true) }}
append initrd={{ pxe_options.deployment_ari_path }} selinux=0 disk=cciss/c0d0,sda,hda,vda iscsi_target_iqn={{ pxe_options.deployment_iscsi_iqn }} deployment_id={{ pxe_options.deployment_id }} deployment_key={{ pxe_options.deployment_key }} ironic_api_url={{ pxe_options.ironic_api_url }} troubleshoot=0 {{ pxe_options.pxe_append_params|default("", true) }}
ipappend 3

2
ironic/tests/drivers/pxe_config.template
View File

@ -2,7 +2,7 @@ default deploy
label deploy
kernel /tftpboot/instance_uuid_123/deploy_kernel
append initrd=/tftpboot/instance_uuid_123/deploy_ramdisk selinux=0 disk=cciss/c0d0,sda,hda,vda iscsi_target_iqn=iqn-instance_uuid_123 deployment_id=1be26c0b-03f2-4d2e-ae87-c02d7f33c123 deployment_key=0123456789ABCDEFGHIJKLMNOPQRSTUV ironic_api_url=http://192.168.122.184:6385 test_param
append initrd=/tftpboot/instance_uuid_123/deploy_ramdisk selinux=0 disk=cciss/c0d0,sda,hda,vda iscsi_target_iqn=iqn-instance_uuid_123 deployment_id=1be26c0b-03f2-4d2e-ae87-c02d7f33c123 deployment_key=0123456789ABCDEFGHIJKLMNOPQRSTUV ironic_api_url=http://192.168.122.184:6385 troubleshoot=0 test_param
ipappend 3