openstack/kayobe
Code Issues Proposed changes

Send default gateway DHCP option during workload inspection

Browse Source 
This allows us to access an inspector API that is not on the provisioning network.
This commit is contained in:
Mark Goddard
2017-08-30 16:48:30 +00:00
parent 61ffac59e5
commit fa69ee2775
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/kolla-openstack.yml
View File

@@ -164,6 +164,7 @@
# Ironic inspector's dnsmasq configuration.
kolla_inspector_dhcp_pool_start: "{{ inspection_net_name | net_inspection_allocation_pool_start }}"
kolla_inspector_dhcp_pool_end: "{{ inspection_net_name | net_inspection_allocation_pool_end }}"
kolla_inspector_default_gateway: "{{ inspection_net_name | net_gateway }}"
# Extra free-form user-provided configuration.
kolla_extra_glance: "{{ kolla_extra_config.glance | default }}"
kolla_extra_inspector: "{{ kolla_extra_config.inspector | default }}"

3
ansible/roles/kolla-openstack/defaults/main.yml
View File

@@ -175,6 +175,9 @@ kolla_inspector_dhcp_pool_start:
# End of range of IP addresses for dnsmasq to allocate from.
kolla_inspector_dhcp_pool_end:
# IP address of default gateway to advertise via DHCP.
kolla_inspector_default_gateway:
# Free form extra configuration to append to dnsmasq.conf.
kolla_extra_ironic_dnsmasq:

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

@@ -8,6 +8,10 @@ dhcp-option=option:tftp-server,{% raw %}{{ hostvars[inventory_hostname]['ansible
dhcp-option=option:server-ip-address,{% raw %}{{ hostvars[inventory_hostname]['ansible_' ~ provision_interface | replace('-', '_')]['ipv4']['address'] }}{% endraw %}
{% if kolla_inspector_default_gateway %}
dhcp-option=3,{{ kolla_inspector_default_gateway }}
{% endif %}
dhcp-option=option:bootfile-name,pxelinux.0
dhcp-option=210,/tftpboot/