From: Mohammed Naser Date: Wed, 14 Jul 2021 17:03:28 +0000 (-0400) Subject: Drop AVAILABILITY_ZONE X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F33135%2F1;p=ci-management.git Drop AVAILABILITY_ZONE By default, OpenStack will schedule you into the right availablity zone that has capacity, hard coding this can potentially result in not being able to provision new virtual machines. This patch drops the hard-wired value and lets Nova on the scheduling size pick the correct availability zone. Signed-off-by: Mohammed Naser Change-Id: Id87111f06ad702daedb947f7e4d67f4cbbc2ad1a --- diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index 80e19418e..da74aff20 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg @@ -15,7 +15,6 @@ INSTANCE_CAP=20 SANDBOX_CAP=5 FLOATING_IP_POOL= SECURITY_GROUPS=default -AVAILABILITY_ZONE=ca-ymq-2 STARTUP_TIMEOUT=600000 KEY_PAIR_NAME=jenkins NUM_EXECUTORS=1 diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 408cfc168..5af2443e7 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -28,8 +28,6 @@ providers: - name: 'verify-merge' cloud: vexxhost max-servers: 10 - availability-zones: - - 'ca-ymq-2' template-hostname: 'np-verify-merge-{timestamp}-nodepool-template' keypair: 'jenkins' networks: @@ -46,8 +44,6 @@ providers: - name: 'multilink' cloud: vexxhost max-servers: 16 - availability-zones: - - 'ca-ymq-2' template-hostname: 'np-multi-link-{timestamp}-nodepool-template' keypair: 'jenkins' networks: