openstack/bifrost
Code Issues Proposed changes

Merge branch 'master' of https://github.com/juliakreger/ironic-poc

Browse Source
This commit is contained in:
Julia Kreger 2015-03-04 20:35:25 -05:00
commit a09d4ab15c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/install.yaml
View File

@ -152,7 +152,7 @@
- name: "Place Ironic Config file" - name: "Place Ironic Config file"
local_action: template src=templates/ironic.conf.j2 dest=/etc/ironic/ironic.conf local_action: template src=templates/ironic.conf.j2 dest=/etc/ironic/ironic.conf
- name: "Place Ironic IPA Agent PXE configuration file" - 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" - name: "Copy policy.json to /etc/ironic"
local_action: copy src=/opt/stack/ironic/etc/ironic/policy.json dest=/etc/ironic/ local_action: copy src=/opt/stack/ironic/etc/ironic/policy.json dest=/etc/ironic/
- name: "Creating Ironic DB Schema" - name: "Creating Ironic DB Schema"

2
setup/templates/agent_config.template.j2
View File

@ -5,7 +5,7 @@ dhcp
goto deploy goto deploy
: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 {{ '}}' }} initrd http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:8080{{ '{{' }} pxe_options.deployment_ari_path {{ '}}' }}
boot boot