From: Eric Ball <eball@linuxfoundation.org>
Date: Wed, 14 Jul 2021 21:15:56 +0000 (+0000)
Subject: Merge "Automation adds pred-vanet-mec.yaml"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=dbe73f22dd95ab821ac9e5951e6c9904d95d8d1b;hp=913bbb72f33fabfcbc20fde08d9e0552f5e76b43

Merge "Automation adds pred-vanet-mec.yaml"
---

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index b682e90..e269d02 100644
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -13,7 +13,6 @@ INSTANCE_CAP=10
 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 020bb0a..3518e73 100644
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -6,7 +6,6 @@
     "cloud_network": null,
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
-    "cloud_availability_zone": "ca-ymq-2",
     "vm_use_block_storage": "true",
     "vm_volume_size": "30",
     "vm_image_disk_format": "",