X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=packer%2Fubuntu1604-ovf-osm.json;h=c2071a9a079ac29555e7a24aa607c3bb3d8a052e;hb=cfbccb541ba673303103859798523442cffedc12;hp=d4a2c776e299544c6f9741a7b3eaef4a2b1705a5;hpb=6f50dedea4b9e4274a0c8d38bfca0267405242c3;p=osm%2Fdevops.git

diff --git a/packer/ubuntu1604-ovf-osm.json b/packer/ubuntu1604-ovf-osm.json
index d4a2c776..c2071a9a 100644
--- a/packer/ubuntu1604-ovf-osm.json
+++ b/packer/ubuntu1604-ovf-osm.json
@@ -19,7 +19,8 @@
   "variables": {
     "osm_install_options": "--vimemu",
     "input_ovf": "output-virtualbox-iso/packer-ubuntu-16.04-amd64-juju.ovf",
-    "vm_name": "xenial-osm"
+    "vm_name": "xenial-osm",
+    "build_dir": "osm-{{timestamp}}"
   },
   "builders": [
     {
@@ -30,10 +31,10 @@
       "ssh_password": "vagrant",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
-      "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now",
+      "shutdown_command": "echo '/sbin/shutdown -h -P now' > /tmp/shutdown.sh; echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'",
       "virtualbox_version_file": ".vbox_version",
       "vm_name": "{{user `vm_name`}}",
-      "output_directory": "osm-{{timestamp}}",
+      "output_directory": "{{user `build_dir`}}",
       "vboxmanage": [
         [
           "modifyvm",
@@ -53,7 +54,7 @@
   "post-processors": [
     [
       {
-	"output": "osm-{{timestamp}}/{{.Provider}}-osm.box",
+	"output": "{{user `build_dir`}}/{{.Provider}}-osm.box",
 	"type": "vagrant",
 	"keep_input_artifact": true
       },