Update relative paths

Packer paths are relative to where it is called from so update the
paths to match where we expect users of common-packer to load the
submodule from.

Change-Id: I03cd26c4fdb7cd2611cd6ae968ddd4470ba33fad
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/templates/builder.json.example b/templates/builder.json.example
index ea9454a..923a02c 100644 (file)
--- a/templates/builder.json.example
+++ b/templates/builder.json.example
@@ -40,16 +40,16 @@
     {
       "type": "shell",
       "scripts": [
-        "provision/install-python.sh"
+        "common-packer/provision/install-python.sh"
       ],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
       "type": "ansible",
-      "playbook_file": "provision/baseline.yaml",
+      "playbook_file": "common-packer/provision/baseline.yaml",
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
-        "ANSIBLE_ROLES_PATH=lf-ansible/roles",
+        "ANSIBLE_ROLES_PATH=../lf-ansible/roles",
         "ANSIBLE_STDOUT_CALLBACK=debug"
       ]
     }

diff --git a/vars/centos-7.json b/vars/centos-7.json
index 678a903..4d8ea05 100644 (file)
--- a/vars/centos-7.json
+++ b/vars/centos-7.json
@@ -2,5 +2,5 @@
   "base_image": "LF - CentOS 7.1711 (2017-11-05)",
   "distro": "CentOS 7",
   "ssh_user": "centos",
-  "cloud_user_data": "provision/rh-user_data.sh"
+  "cloud_user_data": "common-packer/provision/rh-user_data.sh"
 }

diff --git a/vars/ubuntu-16.04.json b/vars/ubuntu-16.04.json
index 58a54d3..eba1e06 100644 (file)
--- a/vars/ubuntu-16.04.json
+++ b/vars/ubuntu-16.04.json
@@ -2,5 +2,5 @@
   "base_image": "LF - Ubuntu 16.04 LTS (2017-12-01)",
   "distro": "Ubuntu 16.04",
   "ssh_user": "ubuntu",
-  "cloud_user_data": "provision/ubuntu-user_data.sh"
+  "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh"
 }