openstack/bifrost
Code Issues Proposed changes

Correct pxe template for CoreOS config drive

Browse Source 
In a previous commit, we erroniously removed the setting to disable
CoreOS from loading configuration drive files.  Turns out that the
solution in Ironic was to update the template files, and to await
for CoreOS to remedy the issue, which has not occured.

This ultimately results in every other deployment to a machine
to be missing a configuration drive since we removed the setting.

As such, we need to put the setting back, this time in the template
file we utilize.

Previous commit: I0e044121e146f3036aa6b1830983dd9d7a68e9ac

Change-Id: I7d4a9c165f069865a26f6900f64046485f00cdee
This commit is contained in:
Julia Kreger 2015-09-15 07:21:18 -04:00
parent 7f359542c2
commit e3d42dc851
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/bifrost-ironic-install/templates/agent_config.template.j2
View File

@ -5,7 +5,7 @@ dhcp
goto deploy
:deploy
kernel {{ '{{' }} pxe_options.deployment_aki_path {{ '}}' }} {{ extra_kernel_options|default('') }} ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} text {{ '{{' }} pxe_options.pxe_append_params {{ '}}' }} ipa-api-url={{ '{{' }} pxe_options['ipa-api-url'] {{ '}}' }} ipa-driver-name={{ '{{' }} pxe_options['ipa-driver-name'] {{ '}}' }}
kernel {{ '{{' }} pxe_options.deployment_aki_path {{ '}}' }} {{ extra_kernel_options|default('') }} ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} text {{ '{{' }} pxe_options.pxe_append_params {{ '}}' }} ipa-api-url={{ '{{' }} pxe_options['ipa-api-url'] {{ '}}' }} ipa-driver-name={{ '{{' }} pxe_options['ipa-driver-name'] {{ '}}' }} coreos.configdrive=0
initrd {{ '{{' }} pxe_options.deployment_ari_path {{ '}}' }}
boot