openstack/kayobe
Code Issues Proposed changes

Make tftp server listen on the internal interface

Browse Source 
TrivialFix

Change-Id: I32e53f018e2d8b3f7740fb5fd2cb05074fb17661
This commit is contained in:
Kayobe deployment user 2018-06-07 11:52:54 +01:00 committed by Will Szumski
parent f034ae4741
commit e7148bc61a
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/kolla-ansible/templates/globals.yml.j2
View File

@ -117,10 +117,6 @@ neutron_bridge_name: "{{ kolla_neutron_bridge_names | join(',') }}"
# control plane. # control plane.
bifrost_network_interface: "{{ kolla_bifrost_network_interface }}" bifrost_network_interface: "{{ kolla_bifrost_network_interface }}"
# This is the interface to use for bare metal provisioning. It is not a
# standard kolla variable.
provision_interface: "{{ kolla_provision_interface }}"
# Interface on which the inspector dnsmasq service listens. # Interface on which the inspector dnsmasq service listens.
ironic_dnsmasq_interface: "{{ kolla_inspector_dnsmasq_interface }}" ironic_dnsmasq_interface: "{{ kolla_inspector_dnsmasq_interface }}"

1
ansible/roles/kolla-ansible/tests/test-defaults.yml
View File

@ -90,7 +90,6 @@
neutron_external_interface: "eth6,eth7" neutron_external_interface: "eth6,eth7"
neutron_bridge_name: "br0,br1" neutron_bridge_name: "br0,br1"
bifrost_network_interface: "eth8" bifrost_network_interface: "eth8"
provision_interface: "eth9"
ironic_dnsmasq_interface: "eth10" ironic_dnsmasq_interface: "eth10"
neutron_plugin_agent: "openvswitch" neutron_plugin_agent: "openvswitch"
kolla_enable_tls_external: False kolla_enable_tls_external: False

1
ansible/roles/kolla-ansible/tests/test-extras.yml
View File

@ -184,7 +184,6 @@
neutron_external_interface: "eth6,eth7" neutron_external_interface: "eth6,eth7"
neutron_bridge_name: "br0,br1" neutron_bridge_name: "br0,br1"
bifrost_network_interface: "eth8" bifrost_network_interface: "eth8"
provision_interface: "eth9"
ironic_dnsmasq_interface: "eth10" ironic_dnsmasq_interface: "eth10"
neutron_plugin_agent: "openvswitch" neutron_plugin_agent: "openvswitch"
kolla_enable_tls_external: False kolla_enable_tls_external: False

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

@ -4,9 +4,9 @@ interface={% raw %}{{ ironic_dnsmasq_interface }}{% endraw %}
bind-interfaces bind-interfaces
dhcp-range={{ kolla_inspector_dhcp_pool_start }},{{ kolla_inspector_dhcp_pool_end }},12h dhcp-range={{ kolla_inspector_dhcp_pool_start }},{{ kolla_inspector_dhcp_pool_end }},12h
dhcp-sequential-ip dhcp-sequential-ip
dhcp-option=option:tftp-server,{% raw %}{{ hostvars[inventory_hostname]['ansible_' ~ provision_interface | replace('-', '_')]['ipv4']['address'] }}{% endraw %} dhcp-option=option:tftp-server,{% raw %}{{ hostvars[inventory_hostname]['ansible_' ~ api_interface | replace('-', '_')]['ipv4']['address'] }}{% endraw %}
dhcp-option=option:server-ip-address,{% raw %}{{ hostvars[inventory_hostname]['ansible_' ~ provision_interface | replace('-', '_')]['ipv4']['address'] }}{% endraw %} dhcp-option=option:server-ip-address,{% raw %}{{ hostvars[inventory_hostname]['ansible_' ~ api_interface | replace('-', '_')]['ipv4']['address'] }}{% endraw %}
{% if kolla_inspector_default_gateway %} {% if kolla_inspector_default_gateway %}
dhcp-option=3,{{ kolla_inspector_default_gateway }} dhcp-option=3,{{ kolla_inspector_default_gateway }}

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

@ -37,7 +37,7 @@ pxe_append_params = {{ kolla_ironic_pxe_append_params | join(',') }}
{% endif %} {% endif %}
{% raw %} {% raw %}
tftp_server = {{ hostvars[inventory_hostname]['ansible_' + provision_interface | replace('-', '_')]['ipv4']['address'] }} tftp_server = {{ hostvars[inventory_hostname]['ansible_' + api_interface | replace('-', '_')]['ipv4']['address'] }}
{% endraw %} {% endraw %}
{% if kolla_extra_ironic %} {% if kolla_extra_ironic %}

3
releasenotes/notes/tftp-listen-on-internal-interface-09aeec7ad99fc13d.yaml Normal file
View File

@ -0,0 +1,3 @@
---
upgrade:
- Ironic is now configured to use the internal network to reach the TFTP server (by default).