X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Ftemplates%2Fmininet-ovs-2.8.json;h=89c23ec8f8c764873bcf2d8b3e390dc346b263b5;hb=38c757a74149f6d119893dc2ddea4325437c6a3a;hp=e7e625769819254cbd0af81183d3c2e37a36a07e;hpb=65dfbd8fb47b909c49f41d539bb5b8a2414d8d60;p=releng%2Fbuilder.git

diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index e7e625769..89c23ec8f 100644
--- a/packer/templates/mininet-ovs-2.8.json
+++ b/packer/templates/mininet-ovs-2.8.json
@@ -10,13 +10,14 @@
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
     "distro": null,
-    "flavor": "v2-highcpu-1",
+    "docker_source_image": null,
+    "flavor": "v3-standard-2",
     "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "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`}}",
@@ -33,6 +34,13 @@
       "use_blockstorage_volume": "{{user `vm_use_block_storage`}}",
       "volume_size": "{{user `vm_volume_size`}}",
       "image_disk_format": "{{user `vm_image_disk_format`}}"
+    },
+    {
+      "name": "docker",
+      "type": "docker",
+      "image": "{{ user `docker_source_image` }}",
+      "commit": true,
+      "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"]
     }
   ],
   "provisioners": [
@@ -48,12 +56,18 @@
     {
       "type": "ansible",
       "playbook_file": "provision/mininet-ovs-2.8.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",
         "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
         "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
         "ANSIBLE_STDOUT_CALLBACK=debug"
+      ],
+      "extra_arguments": [
+        "--ssh-extra-args",
+        "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa"
       ]
     }
   ]