From 6485404dda02505f48cef60d9aafd726c3aacfa8 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Tue, 29 Dec 2020 12:06:23 -0800 Subject: [PATCH] Remove openstack AZ from templates The availability zone started causing issues with packer builds. Per Vexxhost help, there is only one AZ, and removing this line alleviates the issue. Issue: RELENG-3344 Change-Id: Icf60fe527ae328d7883ef38c3efba9972d2f2669 Signed-off-by: Eric Ball --- releasenotes/notes/remove-az-2b83fb257ddc49f7.yaml | 5 +++++ templates/builder.json | 2 -- templates/docker.json | 2 -- templates/windows-builder.json | 2 -- 4 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/remove-az-2b83fb257ddc49f7.yaml diff --git a/releasenotes/notes/remove-az-2b83fb257ddc49f7.yaml b/releasenotes/notes/remove-az-2b83fb257ddc49f7.yaml new file mode 100644 index 0000000..61fccd0 --- /dev/null +++ b/releasenotes/notes/remove-az-2b83fb257ddc49f7.yaml @@ -0,0 +1,5 @@ +--- +issues: + - | + Remove availability zone from Openstack templates. This was causing errors, + and is unnecessary (there is only one AZ for these images). diff --git a/templates/builder.json b/templates/builder.json index fb8a4ba..f4ca2f9 100644 --- a/templates/builder.json +++ b/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/templates/docker.json b/templates/docker.json index 3898d12..2254dd2 100644 --- a/templates/docker.json +++ b/templates/docker.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/templates/windows-builder.json b/templates/windows-builder.json index 0bfe76a..f0e5758 100644 --- a/templates/windows-builder.json +++ b/templates/windows-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": "", @@ -21,7 +20,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`}}", "flavor": "{{user `flavor`}}", -- 2.16.6