Merge "Move aaa and netconf CSIT to MRI list"

[releng/builder.git] / packer / templates / mininet-ovs-2.8.json

diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index c1d1fd3fbc95551576f059f67b3e127c8393020b..c8412343f8ef4b8c0fd40bb6e00e6c54bdd2f88e 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": "",
@@ -17,13 +16,12 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-mininet-ovs-28-{{uuid}}",
       "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`}}",
@@ -40,9 +38,7 @@
   "provisioners": [
     {
       "type": "shell",
-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {