summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2018-10-05 11:04:12 +0000
committerMark Goddard <mark@stackhpc.com>2018-10-09 17:09:52 +0100
commit9382208d7f35486615bb8868d8e8f03834dbb11e (patch)
tree839144fbbdfed2bdb60ffe906963dff448c6d1b8
parent98213c0de4a163934dde57a5092d1e418c99e529 (diff)
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
Notes
Notes (review): Code-Review+2: Nick Jones <nick@stackhpc.com> Code-Review+2: Doug Szumski <doug@stackhpc.com> Workflow+1: Doug Szumski <doug@stackhpc.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 09 Oct 2018 19:49:01 +0000 Reviewed-on: https://review.openstack.org/609044 Project: openstack/kayobe Branch: refs/heads/master
-rw-r--r--ansible/roles/kolla-ansible/defaults/main.yml2
-rw-r--r--ansible/roles/kolla-ansible/tests/test-defaults.yml2
-rw-r--r--ansible/roles/kolla-ansible/tests/test-extras.yml4
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 bc0b1b0..29a054c 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:
127 kolla_storage_interface: "storage_interface" 127 kolla_storage_interface: "storage_interface"
128 kolla_cluster_interface: "cluster_interface" 128 kolla_cluster_interface: "cluster_interface"
129 kolla_provision_interface: "provision_interface" 129 kolla_provision_interface: "provision_interface"
130 kolla_inspector_dnsmasq_interface: "inspector_dnsmasq_interface" 130 kolla_inspector_dnsmasq_interface: "ironic_dnsmasq_interface"
131 kolla_dns_interface: "dns_interface" 131 kolla_dns_interface: "dns_interface"
132 kolla_tunnel_interface: "tunnel_interface" 132 kolla_tunnel_interface: "tunnel_interface"
133 kolla_neutron_external_interfaces: "neutron_external_interface" 133 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 ebd2679..c08516d 100644
--- a/ansible/roles/kolla-ansible/tests/test-defaults.yml
+++ b/ansible/roles/kolla-ansible/tests/test-defaults.yml
@@ -109,7 +109,7 @@
109 - storage_interface 109 - storage_interface
110 - cluster_interface 110 - cluster_interface
111 - provision_interface 111 - provision_interface
112 - inspector_dnsmasq_interface 112 - ironic_dnsmasq_interface
113 - dns_interface 113 - dns_interface
114 - tunnel_interface 114 - tunnel_interface
115 - bifrost_network_interface 115 - bifrost_network_interface
diff --git a/ansible/roles/kolla-ansible/tests/test-extras.yml b/ansible/roles/kolla-ansible/tests/test-extras.yml
index bd052ae..327c385 100644
--- a/ansible/roles/kolla-ansible/tests/test-extras.yml
+++ b/ansible/roles/kolla-ansible/tests/test-extras.yml
@@ -317,7 +317,7 @@
317 - storage_interface 317 - storage_interface
318 - cluster_interface 318 - cluster_interface
319 - provision_interface 319 - provision_interface
320 - inspector_dnsmasq_interface 320 - ironic_dnsmasq_interface
321 - dns_interface 321 - dns_interface
322 - tunnel_interface 322 - tunnel_interface
323 - bifrost_network_interface 323 - bifrost_network_interface
@@ -401,7 +401,7 @@
401 assert: 401 assert:
402 that: item in inventory_lines 402 that: item in inventory_lines
403 with_items: 403 with_items:
404 - 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"' 404 - 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"'
405 - 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"' 405 - 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"'
406 406
407 always: 407 always: