Browse Source

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
tags/4.0.0
Mark Goddard 7 months ago
parent
commit
9382208d7f

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

@@ -127,7 +127,7 @@ kolla_overcloud_inventory_pass_through_host_vars_map:
127 127
   kolla_storage_interface: "storage_interface"
128 128
   kolla_cluster_interface: "cluster_interface"
129 129
   kolla_provision_interface: "provision_interface"
130
-  kolla_inspector_dnsmasq_interface: "inspector_dnsmasq_interface"
130
+  kolla_inspector_dnsmasq_interface: "ironic_dnsmasq_interface"
131 131
   kolla_dns_interface: "dns_interface"
132 132
   kolla_tunnel_interface: "tunnel_interface"
133 133
   kolla_neutron_external_interfaces: "neutron_external_interface"

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

@@ -109,7 +109,7 @@
109 109
               - storage_interface
110 110
               - cluster_interface
111 111
               - provision_interface
112
-              - inspector_dnsmasq_interface
112
+              - ironic_dnsmasq_interface
113 113
               - dns_interface
114 114
               - tunnel_interface
115 115
               - bifrost_network_interface

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

@@ -317,7 +317,7 @@
317 317
               - storage_interface
318 318
               - cluster_interface
319 319
               - provision_interface
320
-              - inspector_dnsmasq_interface
320
+              - ironic_dnsmasq_interface
321 321
               - dns_interface
322 322
               - tunnel_interface
323 323
               - bifrost_network_interface
@@ -401,7 +401,7 @@
401 401
           assert:
402 402
             that: item in inventory_lines
403 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 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 407
       always:

Loading…
Cancel
Save