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 97e6f2e002c16699b0f0637f4183d32d7f20cb71..9abb28f4a90b702000f4203d65bf9d41fb436d2b 100644 (file)
--- a/packer/templates/devstack-pre-pip-stein.json
+++ b/packer/templates/devstack-pre-pip-stein.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`}} - devstack-stein - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-devstack-stein-{{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,14 +34,19 @@
       "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": [
     {
       "type": "shell",
-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
@@ -52,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",