From 4f3ab580f68c10fd81120b5157b08815e2870ca8 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Wed, 29 Jan 2020 16:42:19 -0800 Subject: [PATCH] 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 --- releasenotes/notes/fix-floating-ip-pool-0d2122df77d463e9.yaml | 6 ++++++ shell/jenkins-configure-clouds.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-floating-ip-pool-0d2122df77d463e9.yaml 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") -- 2.16.6