From d31e88a4a18274b0438b09845d81cc9fdae16623 Mon Sep 17 00:00:00 2001
From: David Shrewsbury <shrewsbury.dave@gmail.com>
Date: Wed, 4 Mar 2015 22:12:31 +0000
Subject: [PATCH 1/2] Fix agent_config.template path

---
 setup/install.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/install.yaml b/setup/install.yaml
index 130365fca..e92a16159 100644
--- a/setup/install.yaml
+++ b/setup/install.yaml
@@ -152,7 +152,7 @@
     - name: "Place Ironic Config file"
       local_action: template src=templates/ironic.conf.j2 dest=/etc/ironic/ironic.conf
     - name: "Place Ironic IPA Agent PXE configuration file"
-      local_action: template src=template/agent_config.template.j2 dest=/etc/ironic/agent_config.template
+      local_action: template src=templates/agent_config.template.j2 dest=/etc/ironic/agent_config.template
     - name: "Copy policy.json to /etc/ironic"
       local_action: copy src=/opt/stack/ironic/etc/ironic/policy.json dest=/etc/ironic/
     - name: "Creating Ironic DB Schema"

From 723a09df437df93a052f5f6ffd95fffcaca6fc18 Mon Sep 17 00:00:00 2001
From: David Shrewsbury <shrewsbury.dave@gmail.com>
Date: Wed, 4 Mar 2015 22:19:26 +0000
Subject: [PATCH 2/2] Fix agent_config.template.j2 format

---
 setup/templates/agent_config.template.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/templates/agent_config.template.j2 b/setup/templates/agent_config.template.j2
index e15634cc1..9c691baf3 100644
--- a/setup/templates/agent_config.template.j2
+++ b/setup/templates/agent_config.template.j2
@@ -5,7 +5,7 @@ dhcp
 goto deploy
 
 :deploy
-kernel http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:8080{{ '{{' }} pxe_options.deployment_aki_path {{ '}}' }} 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 http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:8080{{ '{{' }} pxe_options.deployment_aki_path {{ '}}' }} 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'] {{ '}}' }}
 
 initrd http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:8080{{ '{{' }} pxe_options.deployment_ari_path {{ '}}' }}
 boot