Update the packer templates in releng/builder

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

diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json
index a99caf9b92b5d2ee1a208521db8a0722a9f43355..4ef3a9f943e7f570733b52916d335e2bb92612eb 100644 (file)
--- a/packer/templates/gbp.json
+++ b/packer/templates/gbp.json
@@ -1,30 +1,40 @@
 {
   "variables": {
+    "ansible_roles_path": ".galaxy",
+    "arch": "x86_64",
     "base_image": null,
-    "distro": null,
     "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",
     "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "builders": [
     {
-      "type": "openstack",
-      "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `ssh_user`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-150405.000\"}}",
+      "name": "vexxhost",
+      "image_name": "ZZCI - {{user `distro`}} - gbp - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-gbp-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
-      "flavor": "v1-standard-1",
-      "networks": [
-        "{{user `cloud_network`}}"
-      ],
+      "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`}}",
+      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
+      "flavor": "{{user `flavor`}}",
       "metadata": {
         "ci_managed": "yes"
-      }
+      },
+      "use_blockstorage_volume": "{{user `vm_use_block_storage`}}",
+      "volume_size": "{{user `vm_volume_size`}}",
+      "image_disk_format": "{{user `vm_image_disk_format`}}"
     }
   ],
   "provisioners": [