Code Review / releng / builder.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 6571295)
Remove openstack AZ from templates 21/94521/2
authorAnil Belur <abelur@linuxfoundation.org>
Fri, 8 Jan 2021 22:04:41 +0000 (08:04 +1000)
committerAnil Belur <abelur@linuxfoundation.org>
Sun, 10 Jan 2021 01:48:32 +0000 (11:48 +1000)
When the availability_zone(AZ) is set, this returns the following
error. The cloud provider has recommended unsetting the value.

Error:
Build 'openstack' errored: Error creating volume:
Bad request with:
[POST https://volume.public.mtl1.vexxhost.net/v3/
f5ab9a59d6c649bd8ed4af258c4ba755/volumes],
error message: {"badRequest": {"code": 400, "message":
"Availability zone 'ca-ymq-2' is invalid."}}

Issue: https://jira.linuxfoundation.org/browse/IT-21300
Change-Id: Iaf65138629aad54534c0e50608b48d25338fbfdf
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
jenkins-config/clouds/openstack/odlvex/cloud.cfg patch | blob | history
packer/templates/builder.json patch | blob | history
packer/templates/devstack-pre-pip-queens.json patch | blob | history
packer/templates/devstack-pre-pip-rocky.json patch | blob | history
packer/templates/devstack-pre-pip-stein.json patch | blob | history
packer/templates/devstack.json patch | blob | history
packer/templates/mininet-ovs-2.5.json patch | blob | history
packer/templates/mininet-ovs-2.6.json patch | blob | history
packer/templates/mininet-ovs-2.8.json patch | blob | history
packer/templates/robot.json patch | blob | history

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 177802ab467198bc5b5df93242b58a4346dcdfd0..866102ecab08b8135bd9551c47e51a2cf817cb92 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -13,7 +13,6 @@ INSTANCE_CAP=75
 SANDBOX_CAP=8
 FLOATING_IP_POOL=
 SECURITY_GROUPS=default
-AVAILABILITY_ZONE=ca-ymq-2
 STARTUP_TIMEOUT=600000
 KEY_PAIR_NAME=jenkins-ssh
 NUM_EXECUTORS=1
diff --git a/packer/templates/builder.json b/packer/templates/builder.json
index fa19226a85adb5f9813cc9734ba4c22c69b2b211..303273d0699024f1f3222ae9875bef304202a52c 100644 (file)
--- a/packer/templates/builder.json
+++ b/packer/templates/builder.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": "20",
     "vm_image_disk_format": "",
@@ -23,7 +22,6 @@
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/devstack-pre-pip-queens.json b/packer/templates/devstack-pre-pip-queens.json
index 602ced538985da593817b5702476ce84e84a46c1..1ec808e383cf60f784fec55092eee4dad8619da7 100644 (file)
--- a/packer/templates/devstack-pre-pip-queens.json
+++ b/packer/templates/devstack-pre-pip-queens.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": "20",
     "vm_image_disk_format": "",
@@ -23,7 +22,6 @@
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/devstack-pre-pip-rocky.json b/packer/templates/devstack-pre-pip-rocky.json
index 348d28e3a6fa8b85d505e66a2ca6647a134e7931..c2b24b85c0328ffd090f2dcf6217dacca97cd6a3 100644 (file)
--- a/packer/templates/devstack-pre-pip-rocky.json
+++ b/packer/templates/devstack-pre-pip-rocky.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": "20",
     "vm_image_disk_format": "",
@@ -23,7 +22,6 @@
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/devstack-pre-pip-stein.json b/packer/templates/devstack-pre-pip-stein.json
index f2936434bbf4d6d265a97ccf1d92062926b349a8..df2557650a2bc6eb56b36eec9666926cef2210fe 100644 (file)
--- a/packer/templates/devstack-pre-pip-stein.json
+++ b/packer/templates/devstack-pre-pip-stein.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": "20",
     "vm_image_disk_format": "",
@@ -23,7 +22,6 @@
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index e461a9a24ab15d33e65fbcf8a885eba81f14b80e..5847ad81da52508d98eb50a21fae224fdb73171b 100644 (file)
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.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": "20",
     "vm_image_disk_format": "",
@@ -23,7 +22,6 @@
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
index 804a279e7c9e238f7522c36894c56d32d397dcb4..908286aa7163cc76552a3150e8284ca036a41a90 100644 (file)
--- a/packer/templates/mininet-ovs-2.5.json
+++ b/packer/templates/mininet-ovs-2.5.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": "20",
     "vm_image_disk_format": "",
@@ -23,7 +22,6 @@
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json
index 0a9e5fdec9129f40890e331693b27aaa449e129c..7855df992427a54f02ef7a6c9c16872513d79dc2 100644 (file)
--- a/packer/templates/mininet-ovs-2.6.json
+++ b/packer/templates/mininet-ovs-2.6.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": "20",
     "vm_image_disk_format": "",
@@ -23,7 +22,6 @@
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index 1b3a34f4b986bb8fcc29d447a3c0f6f4f42ca674..e7e625769819254cbd0af81183d3c2e37a36a07e 100644 (file)
--- a/packer/templates/mininet-ovs-2.8.json
+++ b/packer/templates/mininet-ovs-2.8.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": "20",
     "vm_image_disk_format": "",
@@ -23,7 +22,6 @@
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index 7adc08c7f56cbc216499f764474f66c657aefe9e..89d076ffa38fd0faccb6724319176034b132962d 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.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": "20",
     "vm_image_disk_format": "",
@@ -23,7 +22,6 @@
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "region": "{{user `cloud_region`}}",
-      "availability_zone": "{{user `cloud_availability_zone`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
Release Engineering Build infrastructure (Jenkins Job Builder, Packer, etc)