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 <mnaser@vexxhost.com>
Change-Id: Ibd3759a5f41af9ffa8f652dd47a388c5572c33d6

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index b682e90..e269d02 100644 (file)
--- 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 (file)
--- 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": "",