openstack/bifrost
Code Issues Proposed changes

Update iPXE agent template and boot.ipxe ownership

Browse Source 
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
This commit is contained in:
Julia Kreger 2015-08-31 09:04:14 -04:00
parent 4c65e3d7b3
commit 0869e7b756
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
View File

@ -34,7 +34,7 @@
copy: src={{ syslinux_tftp_dir }}/pxelinux.0 dest=/tftpboot copy: src={{ syslinux_tftp_dir }}/pxelinux.0 dest=/tftpboot
when: test_pxelinux.stat.exists == false when: test_pxelinux.stat.exists == false
- name: "Place boot.ipxe helper script to HTTP root" - 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" - name: "Place tftp config file"
copy: src=xinetd.tftp dest=/etc/xinetd.d/tftp copy: src=xinetd.tftp dest=/etc/xinetd.d/tftp
- name: "Copy iPXE image into place" - name: "Copy iPXE image into place"

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

@ -5,8 +5,8 @@ dhcp
goto deploy goto deploy
: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 boot