Merge "Add upgrade tests job"

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

diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
index 3c7f9d1701149757af4e40260545f77412820fe0..70a81d530552afc0b17d3cabf76c295435923f23 100644 (file)
--- a/packer/templates/mininet-ovs-2.5.json
+++ b/packer/templates/mininet-ovs-2.5.json
@@ -2,11 +2,7 @@
   "variables": {
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -14,16 +10,12 @@
   "builders": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-mininet-ovs-25-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [