diff options
| author | Lucas Alvares Gomes <lucasagomes@gmail.com> | 2013-11-25 11:45:26 +0000 |
|---|---|---|
| committer | Lucas Alvares Gomes <lucasagomes@gmail.com> | 2013-11-25 11:53:56 +0000 |
| commit | 151fe203397427dbc63d2f20c3ad8b3eb579add5 (patch) | |
| tree | c4128ed73f05c00e8966f9a42e5286378c336977 /ironic | |
| parent | e94e918589b8837470d16504ba9e9e7f77a8337c (diff) | |
| download | ironic-151fe203397427dbc63d2f20c3ad8b3eb579add5.tar.gz | |
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
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/modules/pxe_config.template | 2 | ||||
| -rw-r--r-- | ironic/tests/drivers/pxe_config.template | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ironic/drivers/modules/pxe_config.template b/ironic/drivers/modules/pxe_config.template index 7549bbd61..ba5089bfe 100644 --- a/ironic/drivers/modules/pxe_config.template +++ b/ironic/drivers/modules/pxe_config.template @@ -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 diff --git a/ironic/tests/drivers/pxe_config.template b/ironic/tests/drivers/pxe_config.template index 874024313..c4f184958 100644 --- a/ironic/tests/drivers/pxe_config.template +++ b/ironic/tests/drivers/pxe_config.template @@ -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 |