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/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index 284237e..e36e506 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -176,7 +176,7 @@
"ssh_password": "{{user `password`}}",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
- "shutdown_command": "shutdown -P now",
+ "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
"headless": true,
"vboxmanage": [
[
@@ -253,7 +253,7 @@
"ssh_password": "{{user `password`}}",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
- "shutdown_command": "shutdown -P now",
+ "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
"vmx_data": {
"memsize": "1024",
"numvcpus": "1",
@@ -295,7 +295,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"
},