From fe8f6606893d7f3c9aef16ccfb56704d980d6e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20Thi=C3=A9ry?= <florent.thiery@ubicast.eu>
Date: Wed, 22 Feb 2017 18:45:59 +0100
Subject: [PATCH] add NETWORK_IP_NAT conf variable, refs #20581
---
global-conf.sh | 2 ++
tests/test_dns_records.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/global-conf.sh b/global-conf.sh
index d625f1e3..7ac181b4 100644
--- a/global-conf.sh
+++ b/global-conf.sh
@@ -79,6 +79,8 @@ NETWORK_DNS1=0
NETWORK_DNS2=0
NETWORK_MASK=0
NETWORK_GATEWAY=0
+# define this if IP is NATed
+NETWORK_IP_NAT=0
# proxy
PROXY_HTTP=
PROXY_HTTPS=
diff --git a/tests/test_dns_records.py b/tests/test_dns_records.py
index 1d593fe3..066069a2 100755
--- a/tests/test_dns_records.py
+++ b/tests/test_dns_records.py
@@ -53,7 +53,7 @@ if os.path.isfile('../utils.py'):
es_utils = imp.load_source('es_utils', '../utils.py')
conf = es_utils.load_conf()
- ip = conf.get('NETWORK_IP')
+ ip = conf.get('NETWORK_IP_NAT') or conf.get('NETWORK_IP')
conf_resolvers_keys = (
'NETWORK_DNS1',
--
GitLab