X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Ftemplates%2Fmininet-ovs-2.8.json;h=68f0e5212b088030f0114a1c7554774d41cf2337;hb=d6c0f70fa9bc2dc0f61551953241670b4a52471e;hp=142d492e3c2884d5ca8791815617b5d9c5466f59;hpb=c43275dfa29e4759c12eb34f0408bd7bb8bc382d;p=releng%2Fbuilder.git

diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
index 142d492e3..68f0e5212 100644
--- a/packer/templates/mininet-ovs-2.8.json
+++ b/packer/templates/mininet-ovs-2.8.json
@@ -1,12 +1,9 @@
 {
   "variables": {
+    "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": ""
@@ -14,14 +11,10 @@
   "builders": [
     {
       "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-1504\"}}",
+      "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-28 - {{isotime \"20060102-150405.000\"}}",
+      "instance_name": "{{user `distro`}}-mininet-ovs-28-{{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": [
@@ -44,13 +37,17 @@
       ],
       "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/mininet-ovs-2.8.yaml",
       "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"
       ]