X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Ftemplates%2Fmininet-ovs-2.8.json;h=544c685b9094856863f1afa97804d2e0fb262eeb;hb=462b802640fba996bd06588502e5008b88dfb903;hp=1b3a34f4b986bb8fcc29d447a3c0f6f4f42ca674;hpb=5f2492cae9fcc63fc22648f7fb1a553513eb5cd2;p=releng%2Fbuilder.git diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json index 1b3a34f4b..544c685b9 100644 --- a/packer/templates/mininet-ovs-2.8.json +++ b/packer/templates/mininet-ovs-2.8.json @@ -6,24 +6,23 @@ "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": "", "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`}}", "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`}}", @@ -35,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": [