Fix: packer templates for common-packer v0.12.1

[releng/builder.git] / packer / templates / builder.json

diff --git a/packer/templates/builder.json b/packer/templates/builder.json
index 303273d0699024f1f3222ae9875bef304202a52c..51ebe88d98784076eea94c86c0ace2d56399dde4 100644 (file)
--- a/packer/templates/builder.json
+++ b/packer/templates/builder.json
@@ -10,13 +10,14 @@
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
     "distro": null,
-    "flavor": "v2-highcpu-4",
+    "docker_source_image": null,
+    "flavor": "v3-standard-2",
     "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - builder - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-builder-{{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,6 +56,8 @@
     {
       "type": "ansible",
       "playbook_file": "provision/local-builder.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",