From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 29 Jan 2020 01:41:31 +0000 (-0800)
Subject: Set floating-ip-pool default to "public"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=110aa346dd6735e9cad8310c62e4d364b60d9bfe;p=ci-management.git

Set floating-ip-pool default to "public"

We have seen recent issues where the empty setting is being
interpreted as "null" rather than "No value". This breaks the cloud
config. We have a pool called "public" that should be set as the
default.

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

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 737d2684..97f07320 100644
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -12,7 +12,7 @@ NETWORK_ID=b9e029b4-9b35-4a83-a4e6-c820eb00c3ec
 USER_DATA_ID=jenkins-init-script
 INSTANCE_CAP=10
 SANDBOX_CAP=4
-FLOATING_IP_POOL=
+FLOATING_IP_POOL=public
 SECURITY_GROUPS=default
 AVAILABILITY_ZONE=nova
 STARTUP_TIMEOUT=600000