Merge "Use openjdk11 for Magnesium Multi-patch"

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

diff --git a/packer/templates/kubernetes.json b/packer/templates/kubernetes.json
index bce854de64a64ac522acc265c4b34a2dfca18c70..d9c88a39cdfe288e04d7483350c3a18a7a9160d3 100644 (file)
--- a/packer/templates/kubernetes.json
+++ b/packer/templates/kubernetes.json
@@ -3,11 +3,7 @@
     "ansible_roles_path": "roles/coe",
     "base_image": null,
     "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
     "cloud_network": null,
-    "cloud_tenant": null,
     "cloud_user_data": null,
     "ssh_user": null,
     "ssh_proxy_host": ""
@@ -15,14 +11,10 @@
   "builders": [
     {
       "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - kubernetes - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - kubernetes - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-kubernetes-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "domain_name": "Default",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
       "networks": [