From 0869e7b7567af65d70aad45d673bc1afa22b86f7 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Mon, 31 Aug 2015 09:04:14 -0400
Subject: [PATCH] Update iPXE agent template and boot.ipxe ownership

At some point the Ironic iPXE configuration changed.
The params now passed are full URLs and it is no longer
necessary for us to write the beginning of the URL out.

Additionally update the ownership of the boot.ipxe file so
ironic is able to overwrite it.  Far from ideal, but required
at this time.

Closes-Bug: #1490546
Closes-Bug: #1490557
Change-Id: I1a54ac6dce1497823795f896907663b44ebaa67d
---
 .../roles/bifrost-ironic-install/tasks/create_tftpboot.yml    | 2 +-
 .../bifrost-ironic-install/templates/agent_config.template.j2 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml b/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
index 5edaa0b80..610c3714d 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
@@ -34,7 +34,7 @@
   copy: src={{ syslinux_tftp_dir }}/pxelinux.0 dest=/tftpboot
   when: test_pxelinux.stat.exists == false
 - name: "Place boot.ipxe helper script to HTTP root"
-  copy: src=boot.ipxe dest=/httpboot/boot.ipxe
+  copy: src=boot.ipxe dest=/httpboot/boot.ipxe owner=ironic group=ironic
 - name: "Place tftp config file"
   copy: src=xinetd.tftp dest=/etc/xinetd.d/tftp
 - name: "Copy iPXE image into place"
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 8f05bdc8f..949225d0d 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/agent_config.template.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/agent_config.template.j2
@@ -5,8 +5,8 @@ dhcp
 goto deploy
 
 :deploy
-kernel http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:{{nginx_port}}{{ '{{' }} 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'] {{ '}}' }}
 
-initrd http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:{{nginx_port}}{{ '{{' }} pxe_options.deployment_ari_path {{ '}}' }}
+initrd {{ '{{' }} pxe_options.deployment_ari_path {{ '}}' }}
 boot