X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Ftemplates%2Fmininet.json;h=d39f2fb23e3a62664fee1155316521a2800dac4f;hb=6f0850aa18c3a58aaac9a37e21f71f63651eaef1;hp=180975b7519a6921142c2ade68eafdb38700c891;hpb=6b4cc20fa5c48e706201a902c70c63f9e0520603;p=releng%2Fbuilder.git

diff --git a/packer/templates/mininet.json b/packer/templates/mininet.json
index 180975b75..d39f2fb23 100644
--- a/packer/templates/mininet.json
+++ b/packer/templates/mininet.json
@@ -7,51 +7,32 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
-    "private_base_image": null,
-    "private_network": null,
-    "private_cloud_user": null,
-    "private_auth_url": null,
-    "private_tenant": null,
-    "private_user": null,
-    "private_pass": null,
-
     "distro": null,
-    "cloud_user_data": null
+    "cloud_user_data": null,
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
       "type": "openstack",
-      "name": "public_cloud",
       "identity_endpoint": "{{user `public_auth_url`}}",
+      "domain_name": "Default",
       "tenant_name": "{{user `public_tenant`}}",
       "username": "{{user `public_user`}}",
       "password": "{{user `public_pass`}}",
-      "region": "DFW",
+      "region": "ca-ymq-1",
+      "availability_zone": "ca-ymq-2",
       "ssh_username": "{{user `public_cloud_user`}}",
-      "image_name": "{{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "general1-1",
+      "flavor": "v1-standard-1",
       "networks": [
         "{{user `public_network`}}"
       ],
-      "user_data_file": "{{user `cloud_user_data`}}"
-    },
-    {
-      "type": "openstack",
-      "name": "private_cloud",
-      "identity_endpoint": "{{user `private_auth_url`}}",
-      "tenant_name": "{{user `private_tenant`}}",
-      "username": "{{user `private_user`}}",
-      "password": "{{user `private_pass`}}",
-      "ssh_username": "{{user `private_cloud_user`}}",
-      "image_name": "{{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `private_base_image`}}",
-      "flavor": "general1-1",
-      "networks": [
-        "{{user `private_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}"
+      "user_data_file": "{{user `cloud_user_data`}}",
+      "metadata": {
+        "ci_managed": "yes"
+      }
     }
   ],
   "provisioners": [
@@ -60,6 +41,7 @@
       "scripts": [
         "provision/baseline.sh",
         "provision/mininet.sh",
+        "provision/system_reseal_local_env.sh",
         "provision/system_reseal.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"