Fix: packer templates for common-packer v0.12.1

[releng/builder.git] / packer / templates / devstack-pre-pip-stein.json

diff --git a/packer/templates/devstack-pre-pip-stein.json b/packer/templates/devstack-pre-pip-stein.json
index 839a69df0406710c440a39771fded4ddc85e8d03..9abb28f4a90b702000f4203d65bf9d41fb436d2b 100644 (file)
--- a/packer/templates/devstack-pre-pip-stein.json
+++ b/packer/templates/devstack-pre-pip-stein.json
@@ -10,6 +10,7 @@
     "vm_volume_size": "20",
     "vm_image_disk_format": "",
     "distro": null,
+    "docker_source_image": null,
     "flavor": "v3-standard-2",
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -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/devstack-pre-pip.yaml",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "ansible_env_vars": [
         "ANSIBLE_DEBUG=False",
         "ANSIBLE_NOCOWS=1",