From 9382208d7f35486615bb8868d8e8f03834dbb11e Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 5 Oct 2018 11:04:12 +0000 Subject: [PATCH] Fix inspector dnsmasq interface name Kolla-ansible uses the variable 'ironic_dnsmasq_interface' to denote the interface for the ironic inspector dnsmasq service. Previously kayobe was incorrectly using the variable 'inspector_dnsmasq_interface', which caused kolla-ansible to ignore it and use the API interface instead. This patch fixes that. Change-Id: I733a84759cd03b62659dbf2d7027b7be9e42e818 Story: 2004026 Task: 27017 --- ansible/roles/kolla-ansible/defaults/main.yml | 2 +- ansible/roles/kolla-ansible/tests/test-defaults.yml | 2 +- ansible/roles/kolla-ansible/tests/test-extras.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/kolla-ansible/defaults/main.yml b/ansible/roles/kolla-ansible/defaults/main.yml index bc0b1b0db..29a054c0e 100644 --- a/ansible/roles/kolla-ansible/defaults/main.yml +++ b/ansible/roles/kolla-ansible/defaults/main.yml @@ -127,7 +127,7 @@ kolla_overcloud_inventory_pass_through_host_vars_map: kolla_storage_interface: "storage_interface" kolla_cluster_interface: "cluster_interface" kolla_provision_interface: "provision_interface" - kolla_inspector_dnsmasq_interface: "inspector_dnsmasq_interface" + kolla_inspector_dnsmasq_interface: "ironic_dnsmasq_interface" kolla_dns_interface: "dns_interface" kolla_tunnel_interface: "tunnel_interface" kolla_neutron_external_interfaces: "neutron_external_interface" diff --git a/ansible/roles/kolla-ansible/tests/test-defaults.yml b/ansible/roles/kolla-ansible/tests/test-defaults.yml index ebd2679a2..c08516d00 100644 --- a/ansible/roles/kolla-ansible/tests/test-defaults.yml +++ b/ansible/roles/kolla-ansible/tests/test-defaults.yml @@ -109,7 +109,7 @@ - storage_interface - cluster_interface - provision_interface - - inspector_dnsmasq_interface + - ironic_dnsmasq_interface - dns_interface - tunnel_interface - bifrost_network_interface diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml index bd052ae10..327c38544 100644 --- a/ansible/roles/kolla-ansible/tests/test-extras.yml +++ b/ansible/roles/kolla-ansible/tests/test-extras.yml @@ -317,7 +317,7 @@ - storage_interface - cluster_interface - provision_interface - - inspector_dnsmasq_interface + - ironic_dnsmasq_interface - dns_interface - tunnel_interface - bifrost_network_interface @@ -401,7 +401,7 @@ assert: that: item in inventory_lines with_items: - - test-controller ansible_host='"1.2.3.5"' network_interface='"eth0"' api_interface='"eth2"' storage_interface='"eth3"' cluster_interface='"eth4"' provision_interface='"eth8"' inspector_dnsmasq_interface='"eth9"' dns_interface='"eth5"' tunnel_interface='"eth10"' kolla_external_vip_interface='"eth1"' neutron_external_interface='"eth6,eth7"' neutron_bridge_name='"br0,br1"' + - test-controller ansible_host='"1.2.3.5"' network_interface='"eth0"' api_interface='"eth2"' storage_interface='"eth3"' cluster_interface='"eth4"' provision_interface='"eth8"' ironic_dnsmasq_interface='"eth9"' dns_interface='"eth5"' tunnel_interface='"eth10"' kolla_external_vip_interface='"eth1"' neutron_external_interface='"eth6,eth7"' neutron_bridge_name='"br0,br1"' - test-compute ansible_host='"1.2.3.6"' network_interface='"eth0"' api_interface='"eth2"' storage_interface='"eth3"' tunnel_interface='"eth6"' neutron_external_interface='"eth4,eth5"' neutron_bridge_name='"br0,br1"' always: