From 1795ea89593143b6bad8d3b77f50c0432b18a860 Mon Sep 17 00:00:00 2001
From: "ya.wang" <wang.ya@99cloud.net>
Date: Fri, 23 Nov 2018 11:04:49 +0800
Subject: [PATCH] Add ironic_dnsmasq_interface parameter to globals.yml
Specifying a nic for dnsmasq when using ironic inspector,
by default is network_interface
Change-Id: I579c667c40b14030f340c1f3d7f57fe37613ee1a
---
doc/source/reference/bare-metal/ironic-guide.rst | 7 ++++---
etc/kolla/globals.yml | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/doc/source/reference/bare-metal/ironic-guide.rst b/doc/source/reference/bare-metal/ironic-guide.rst
index 9a8c6f88f4..f4deafef32 100644
--- a/doc/source/reference/bare-metal/ironic-guide.rst
+++ b/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"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 62da37ddec..8695485563 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -445,6 +445,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:
--
GitLab