Merge "Add upgrade tests job"

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

diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index cff9a0e1c3041e359262bdda74bd287ed601977d..a6b56635fee54e89915e0a800e11d3d77e404185 100644 (file)
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -3,11 +3,7 @@
     "ansible_roles_path": ".galaxy",
     "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": ""
@@ -19,11 +15,6 @@
       "instance_name": "{{user `distro`}}-robot-{{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": [
@@ -46,6 +37,10 @@
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
+    {
+      "type": "shell-local",
+      "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}}"
+    },
     {
       "type": "ansible",
       "playbook_file": "provision/robot.yaml",