Merge "Switch global-jjb jobs to use mvn35"

[releng/builder.git] / packer / templates / mininet-ovs-2.8.json

diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index 6e941d17bb2e851a59a5108ad5d766dfc740fdff..c79db5556cff1b95e57b0f1c9fbbb0de0fd1bef3 100644 (file)
--- a/packer/templates/mininet-ovs-2.8.json
+++ b/packer/templates/mininet-ovs-2.8.json
@@ -1,5 +1,6 @@
 {
   "variables": {
+    "ansible_roles_path": ".galaxy",
     "base_image": null,
     "distro": null,
     "cloud_auth_url": null,
@@ -14,7 +15,7 @@
   "builders": [
     {
       "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-150405.000\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-1504\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "identity_endpoint": "{{user `cloud_auth_url`}}",
@@ -50,7 +51,7 @@
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
         "ANSIBLE_PIPELINING=True",
-        "ANSIBLE_ROLES_PATH=../lf-ansible/roles",
+        "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}",
         "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ]