From e3d42dc8518389bb8af8b2fe93f17bffca57ce30 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Tue, 15 Sep 2015 07:21:18 -0400
Subject: [PATCH] Correct pxe template for CoreOS config drive

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
---
 .../bifrost-ironic-install/templates/agent_config.template.j2   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playbooks/roles/bifrost-ironic-install/templates/agent_config.template.j2 b/playbooks/roles/bifrost-ironic-install/templates/agent_config.template.j2
index 949225d0d..fc0147481 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/agent_config.template.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/agent_config.template.j2
@@ -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