From: Mohammed Naser <mnaser@vexxhost.com>
Date: Wed, 14 Jul 2021 16:31:58 +0000 (-0400)
Subject: Drop AVAILABILITY_ZONE
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=73f1d115617b1c7de3242901d51328755cd242d5;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.

Issue-ID: CIMAN-407
Change-Id: I4524c3c48595f79c903f159a81e3bb138dd9e9d0
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
---

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 5695a77d1..b82693f53 100644
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -14,7 +14,6 @@ INSTANCE_CAP=75
 SANDBOX_CAP=4
 FLOATING_IP_POOL=
 SECURITY_GROUPS=default
-AVAILABILITY_ZONE=ca-ymq-2
 STARTUP_TIMEOUT=600000
 KEY_PAIR_NAME=jenkins
 NUM_EXECUTORS=1
diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index 93f9161b9..9568c0146 100644
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -25,7 +25,6 @@
       "tenant_name": "{{user `cloud_tenant`}}",
       "domain_name": "Default",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
       "networks": [
         "{{user `cloud_network`}}"
       ],
diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index cd6daeebe..6cdab9d60 100644
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -24,7 +24,6 @@
       "tenant_name": "{{user `cloud_tenant`}}",
       "domain_name": "Default",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
       "networks": [
         "{{user `cloud_network`}}"
       ],
diff --git a/packer/templates/redis.json b/packer/templates/redis.json
index b52a8ac7e..6bf7b17f3 100644
--- a/packer/templates/redis.json
+++ b/packer/templates/redis.json
@@ -24,7 +24,6 @@
       "tenant_name": "{{user `cloud_tenant`}}",
       "domain_name": "Default",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
       "networks": [
         "{{user `cloud_network`}}"
       ],