openstack/kayobe
Code Issues Proposed changes

Merge "Enable iPXE boot in ironic"

Browse Source
This commit is contained in:
Zuul 2018-06-22 09:18:35 +00:00 committed by Gerrit Code Review
commit 0646ae5da8
6 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all/kolla
View File

@ -314,6 +314,7 @@ kolla_enable_heat: "yes"
kolla_enable_horizon: "yes" kolla_enable_horizon: "yes"
kolla_enable_influxdb: "no" kolla_enable_influxdb: "no"
kolla_enable_ironic: "yes" kolla_enable_ironic: "yes"
kolla_enable_ironic_ipxe: "no"
kolla_enable_kafka: "no" kolla_enable_kafka: "no"
kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool else 'no' }}" kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool else 'no' }}"
kolla_enable_magnum: "no" kolla_enable_magnum: "no"

1
ansible/roles/kolla-ansible/defaults/main.yml
View File

@ -207,6 +207,7 @@ kolla_openstack_logging_debug:
#kolla_enable_horizon: #kolla_enable_horizon:
#kolla_enable_influxdb: #kolla_enable_influxdb:
#kolla_enable_ironic: #kolla_enable_ironic:
#kolla_enable_ironic_ipxe:
#kolla_enable_kafka: #kolla_enable_kafka:
#kolla_enable_kuryr: #kolla_enable_kuryr:
#kolla_enable_magnum: #kolla_enable_magnum:

3
ansible/roles/kolla-ansible/templates/overcloud-services.j2
View File

@ -216,6 +216,9 @@ ironic
[ironic-pxe:children] [ironic-pxe:children]
ironic ironic
[ironic-ipxe:children]
ironic
# Magnum # Magnum
[magnum-api:children] [magnum-api:children]
magnum magnum

1
ansible/roles/kolla-ansible/vars/main.yml
View File

@ -87,6 +87,7 @@ kolla_feature_flags:
- horizon - horizon
- influxdb - influxdb
- ironic - ironic
- ironic_ipxe
- ironic_pxe_uefi - ironic_pxe_uefi
- kafka - kafka
- karbor - karbor

17
ansible/roles/kolla-openstack/templates/ironic-dnsmasq.conf.j2
View File

@ -8,12 +8,25 @@ dhcp-option=option:tftp-server,{% raw %}{{ hostvars[inventory_hostname]['ansible
dhcp-option=option:server-ip-address,{% raw %}{{ hostvars[inventory_hostname]['ansible_' ~ api_interface | replace('-', '_')]['ipv4']['address'] }}{% endraw %} dhcp-option=option:server-ip-address,{% raw %}{{ hostvars[inventory_hostname]['ansible_' ~ api_interface | replace('-', '_')]['ipv4']['address'] }}{% endraw %}
dhcp-option=210,/tftpboot/
{% if kolla_inspector_default_gateway %} {% if kolla_inspector_default_gateway %}
dhcp-option=3,{{ kolla_inspector_default_gateway }} dhcp-option=3,{{ kolla_inspector_default_gateway }}
{% endif %} {% endif %}
dhcp-option=option:bootfile-name,pxelinux.0 {% raw %}{% if enable_ironic_ipxe | bool %}
dhcp-option=210,/tftpboot/ dhcp-match=ipxe,175
dhcp-match=set:efi,option:client-arch,7
dhcp-match=set:efi,option:client-arch,9
# Client is already running iPXE; move to next stage of chainloading
dhcp-option=tag:ipxe,option:bootfile-name,{{ ironic_ipxe_url }}/inspector.ipxe
# Client is PXE booting over EFI without iPXE ROM,
# send EFI version of iPXE chainloader
dhcp-option=tag:efi,tag:!ipxe,option:bootfile-name,ipxe.efi
dhcp-option=option:bootfile-name,{{ ironic_dnsmasq_boot_file | default('undionly.kpxe') }}
{% else %}
dhcp-option=option:bootfile-name,{{ ironic_dnsmasq_boot_file | default('pxelinux.0') }}
{% endif %}{% endraw %}
{% if kolla_extra_ironic_dnsmasq %} {% if kolla_extra_ironic_dnsmasq %}
{{ kolla_extra_ironic_dnsmasq }} {{ kolla_extra_ironic_dnsmasq }}

1
etc/kayobe/kolla.yml
View File

@ -174,6 +174,7 @@
#kolla_enable_horizon: #kolla_enable_horizon:
#kolla_enable_influxdb: #kolla_enable_influxdb:
#kolla_enable_ironic: #kolla_enable_ironic:
#kolla_enable_ironic_ipxe:
#kolla_enable_ironic_pxe_uefi: #kolla_enable_ironic_pxe_uefi:
#kolla_enable_iscsid: #kolla_enable_iscsid:
#kolla_enable_karbor: #kolla_enable_karbor: