From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 30 Jan 2020 00:42:19 +0000 (-0800)
Subject: Fix FLOATING_IP_POOL default value
X-Git-Tag: v0.51.0~15
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=4f3ab580f68c10fd81120b5157b08815e2870ca8;p=releng%2Fglobal-jjb.git

Fix FLOATING_IP_POOL default value

A recent change has made the "null" string a bad value for
FLOATING_IP_POOL. By making it an empty string, we recreate the old
functionality of having the default floating IP pool set to "No
value".

Change-Id: If6f2af7a8a6ccf4bb5079e8282962098f2f725b6
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/releasenotes/notes/fix-floating-ip-pool-0d2122df77d463e9.yaml b/releasenotes/notes/fix-floating-ip-pool-0d2122df77d463e9.yaml
new file mode 100644
index 00000000..56257ebc
--- /dev/null
+++ b/releasenotes/notes/fix-floating-ip-pool-0d2122df77d463e9.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    A recent change has made the "null" string a bad value for FLOATING_IP_POOL.
+    By making it an empty string, we recreate the old functionality of having
+    the default floating IP pool set to "No value".
diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh
index e5dba546..5d394ad2 100644
--- a/shell/jenkins-configure-clouds.sh
+++ b/shell/jenkins-configure-clouds.sh
@@ -204,7 +204,7 @@ get_minion_options() {
         instance_cap=$(get_cfg "$cfg_file" INSTANCE_CAP "null")
     fi
 
-    floating_ip_pool=$(get_cfg "$cfg_file" FLOATING_IP_POOL "null")
+    floating_ip_pool=$(get_cfg "$cfg_file" FLOATING_IP_POOL "")
     security_groups=$(get_cfg "$cfg_file" SECURITY_GROUPS "default")
     availability_zone=$(get_cfg "$cfg_file" AVAILABILITY_ZONE "")
     start_timeout=$(get_cfg "$cfg_file" START_TIMEOUT "600000")