Remove duplicate pxe_config_template setting

It was defined twice, once for ipxe_config.template and another
for agent_config.template
Only leaving ipxe_config.template to properly configure settings

Change-Id: Idcb59b4efbdff4466e54f7f8e10fd8f65a8249c5
This commit is contained in:
Yolanda Robla 2015-11-11 12:58:38 +01:00
parent 31930c8fd0
commit 12e3425a05
3 changed files with 0 additions and 20 deletions

View File

@ -72,12 +72,6 @@
insertafter="[pxe]"
regexp='^(.*)pxe_append_params=(.*)$'
line="pxe_append_params=systemd.journald.forward_to_console=yes"
- name: "For agent, place agent PXE template"
lineinfile:
dest=/etc/ironic/ironic.conf
insertafter="[pxe]"
regexp='^(.*)pxe_config_template=(.*)$'
line="pxe_config_template=/etc/ironic/agent_config.template"
- name: "Configure conductor API url"
lineinfile:
dest=/etc/ironic/ironic.conf

View File

@ -104,8 +104,6 @@
file: name=/etc/ironic state=directory owner=ironic group=ironic mode=0755
- name: "Generate ironic Configuration"
include: ironic_config.yml
- name: "Place ironic IPA Agent PXE configuration file"
template: src=agent_config.template.j2 dest=/etc/ironic/agent_config.template owner=ironic group=ironic mode=0644
- name: "Copy policy.json to /etc/ironic"
copy: src="{{ ironic_git_folder }}/etc/ironic/policy.json" dest=/etc/ironic/ owner=ironic group=ironic mode=0644
- name: "Create ironic DB Schema"

View File

@ -1,12 +0,0 @@
#!ipxe
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'] {{ '}}' }} coreos.configdrive=0
initrd {{ '{{' }} pxe_options.deployment_ari_path {{ '}}' }}
boot