Merge "Add ironic_dnsmasq_interface parameter to globals.yml"

doc/source/reference/bare-metal/ironic-guide.rst

@@ -17,12 +17,13 @@ Enable Ironic in ``/etc/kolla/globals.yml``:
 
    enable_ironic: "yes"
 
-In the same file, define a range of IP addresses that will be available for use
-by Ironic inspector, as well as a network to be used for the Ironic cleaning
-network:
+In the same file, define a network interface as the default NIC for dnsmasq,
+a range of IP addresses that will be available for use by Ironic inspector,
+as well as a network to be used for the Ironic cleaning network:
 
 .. code-block:: yaml
 
+   ironic_dnsmasq_interface: "eth1"
    ironic_dnsmasq_dhcp_range: "192.168.5.100,192.168.5.110"
    ironic_cleaning_network: "public1"
 

etc/kolla/globals.yml

@@ -446,6 +446,8 @@ glance_enable_rolling_upgrade: "no"
 #############################
 # Ironic options
 #############################
+# dnsmasq bind interface for Ironic Inspector, by default is network_interface
+#ironic_dnsmasq_interface: "{{ network_interface }}"
 # following value must be set when enable ironic, the value format
 # is "192.168.0.10,192.168.0.100".
 ironic_dnsmasq_dhcp_range: