From f9af17dfbfa29c5616fea6259e58eee7eb0468da Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Wed, 29 Jan 2020 11:07:58 -0500 Subject: [PATCH] FLOATING_IP_POOL is null. null no longer works, the inherited value of public is not being inherited. rather it is being explicitly set to null. floating_ip_pool=$(get_cfg "$cfg_file" FLOATING_IP_POOL "null") This leads me to belive that get_minion_options function will set the floating_ip when set explicitly in the minion configs. Signed-off-by: Aric Gardner Change-Id: I422ce8f170894329ff8efd54970309cd619e2427 --- jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg | 1 + jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg | 2 ++ jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg | 1 + jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg | 1 + 5 files changed, 6 insertions(+) diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg index a2a12fb7..0c3c14db 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg @@ -1,3 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200123-164248.786 HARDWARE_ID=v2-standard-2 VOLUME_SIZE=200 +FLOATING_IP_POOL=public diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg index 288bad50..a428fdd2 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg @@ -1,2 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200123-164248.786 HARDWARE_ID=v2-standard-2 +FLOATING_IP_POOL=public +VOLUME_SIZE=20 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg index f2759619..6a70474a 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg @@ -2,3 +2,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190926-151758.548 LABELS=ubuntu1804-builder-2c-2g HARDWARE_ID=v2-highcpu-2 VOLUME_SIZE=10 +FLOATING_IP_POOL=public diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg index 854fa33a..6cbe7ec0 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg @@ -2,3 +2,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190926-151758.548 LABELS=ubuntu1804-builder-4c-4g HARDWARE_ID=v2-highcpu-4 VOLUME_SIZE=10 +FLOATING_IP_POOL=public diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg index 7adde710..021aea49 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg @@ -2,3 +2,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200123-175351.393 LABELS=ubuntu1804-docker-4c-4g HARDWARE_ID=v2-highcpu-4 VOLUME_SIZE=20 +FLOATING_IP_POOL=public -- 2.16.6