misc updates
* Wait for salt-master and salt-minion to wake up after restart
* fix aptly publisher config path
* refactor cleanup
* remove multiverse from ubuntu_base.
It was never packed into offline - so, should be safe to remove.
Change-Id: Ic5bd8d8085af5db10d52063bff50be41031ef248
diff --git a/day01-image/template.json b/day01-image/template.json
index c4ff8de..cfaa73f 100644
--- a/day01-image/template.json
+++ b/day01-image/template.json
@@ -87,6 +87,8 @@
"scripts": [
"scripts/security.sh",
"scripts/cleanup.sh",
+ "scripts/cleanup_salt.sh",
+ "scripts/cleanup_day01.sh",
"scripts/info.sh",
"scripts/zerodisk.sh"
]
@@ -135,7 +137,7 @@
"ssh_password": "{{user `password`}}",
"ssh_host_port_min": 7000,
"ssh_host_port_max": 7050,
- "shutdown_command": "shutdown -P now",
+ "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
"boot_wait": "2s",
"ssh_wait_timeout": "360s"
}