From d2f7250526bc3abec6fd2cef5b39f837fcf2a703 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Sat, 9 Jan 2021 08:04:41 +1000 Subject: [PATCH 1/1] Remove openstack AZ from templates 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 --- jenkins-config/clouds/openstack/odlvex/cloud.cfg | 1 - packer/templates/builder.json | 2 -- packer/templates/devstack-pre-pip-queens.json | 2 -- packer/templates/devstack-pre-pip-rocky.json | 2 -- packer/templates/devstack-pre-pip-stein.json | 2 -- packer/templates/devstack.json | 2 -- packer/templates/mininet-ovs-2.5.json | 2 -- packer/templates/mininet-ovs-2.6.json | 2 -- packer/templates/mininet-ovs-2.8.json | 2 -- packer/templates/robot.json | 2 -- 10 files changed, 19 deletions(-) diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg index 177802ab4..866102eca 100644 --- 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 fa19226a8..303273d06 100644 --- 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 602ced538..1ec808e38 100644 --- 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 348d28e3a..c2b24b85c 100644 --- 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 f2936434b..df2557650 100644 --- 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 e461a9a24..5847ad81d 100644 --- 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 804a279e7..908286aa7 100644 --- 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 0a9e5fdec..7855df992 100644 --- 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 1b3a34f4b..e7e625769 100644 --- 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 7adc08c7f..89d076ffa 100644 --- 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`}}", -- 2.36.6