projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug 761: change RO Dockerfile to launch RO start script
[osm/devops.git]
/
packer
/
ubuntu1604-ovf-osm.json
diff --git
a/packer/ubuntu1604-ovf-osm.json
b/packer/ubuntu1604-ovf-osm.json
index
d4a2c77
..
c2071a9
100644
(file)
--- 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",
"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": [
{
},
"builders": [
{
@@
-30,10
+31,10
@@
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
"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`}}",
"virtualbox_version_file": ".vbox_version",
"vm_name": "{{user `vm_name`}}",
- "output_directory": "
osm-{{timestamp
}}",
+ "output_directory": "
{{user `build_dir`
}}",
"vboxmanage": [
[
"modifyvm",
"vboxmanage": [
[
"modifyvm",
@@
-53,7
+54,7
@@
"post-processors": [
[
{
"post-processors": [
[
{
- "output": "
osm-{{timestamp
}}/{{.Provider}}-osm.box",
+ "output": "
{{user `build_dir`
}}/{{.Provider}}-osm.box",
"type": "vagrant",
"keep_input_artifact": true
},
"type": "vagrant",
"keep_input_artifact": true
},