Merge "Revert "Enforced salt version 2016.3 for ubuntu""
diff --git a/debian-8/scripts/salt.sh b/debian-8/scripts/salt.sh
index fbee3a0..60b50e9 100644
--- a/debian-8/scripts/salt.sh
+++ b/debian-8/scripts/salt.sh
@@ -1,2 +1,4 @@
+wget -O - https://repo.saltstack.com/apt/debian/8/amd64/2016.3/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+echo "deb http://repo.saltstack.com/apt/debian/8/amd64/2016.3 jessie main" >/etc/apt/sources.list.d/saltstack.list
apt-get -y install salt-minion
mkdir -m700 -p /etc/salt/pki/minion
diff --git a/debian-8/template.json b/debian-8/template.json
index 7f3be00..48d5983 100644
--- a/debian-8/template.json
+++ b/debian-8/template.json
@@ -121,9 +121,9 @@
"output_directory": "images/{{ user `distro` }}-vbox-{{ isotime \"200601020304\" }}",
"guest_os_type": "Debian_64",
"http_directory": "http",
- "iso_checksum": "e9f61bf327db6d8f7cee05a99f2353cc",
+ "iso_checksum": "453312bf56fc45669fec5ebc0f025ac7",
"iso_checksum_type": "md5",
- "iso_url": "http://cdimage.debian.org/debian-cd/8.6.0/amd64/iso-cd/debian-8.6.0-amd64-netinst.iso",
+ "iso_url": "http://cdimage.debian.org/debian-cd/8.7.1/amd64/iso-cd/debian-8.7.1-amd64-netinst.iso",
"ssh_username": "{{user `user`}}",
"ssh_password": "{{user `password`}}",
"ssh_port": 22,
@@ -169,9 +169,9 @@
"output_directory": "images/{{ user `distro` }}-vmware-{{ isotime \"200601020304\" }}",
"guest_os_type": "linux",
"http_directory": "http",
- "iso_checksum": "e9f61bf327db6d8f7cee05a99f2353cc",
+ "iso_checksum": "453312bf56fc45669fec5ebc0f025ac7",
"iso_checksum_type": "md5",
- "iso_url": "http://cdimage.debian.org/debian-cd/8.6.0/amd64/iso-cd/debian-8.6.0-amd64-netinst.iso",
+ "iso_url": "http://cdimage.debian.org/debian-cd/8.7.1/amd64/iso-cd/debian-8.7.1-amd64-netinst.iso",
"ssh_username": "{{user `user`}}",
"ssh_password": "{{user `password`}}",
"ssh_port": 22,
@@ -193,9 +193,9 @@
"format": "qcow2",
"accelerator": "kvm",
"disk_size": "{{ user `disk_size`}}",
- "iso_url": "http://cdimage.debian.org/debian-cd/8.6.0/amd64/iso-cd/debian-8.6.0-amd64-netinst.iso",
+ "iso_url": "http://cdimage.debian.org/debian-cd/8.7.1/amd64/iso-cd/debian-8.7.1-amd64-netinst.iso",
"iso_checksum_type": "md5",
- "iso_checksum": "e9f61bf327db6d8f7cee05a99f2353cc",
+ "iso_checksum": "453312bf56fc45669fec5ebc0f025ac7",
"http_directory": "http",
"headless": true,
"ssh_username": "{{user `user`}}",
diff --git a/ubuntu-14.04/scripts/salt.sh b/ubuntu-14.04/scripts/salt.sh
index fbee3a0..fde2b5b 100644
--- a/ubuntu-14.04/scripts/salt.sh
+++ b/ubuntu-14.04/scripts/salt.sh
@@ -1,2 +1,4 @@
+wget -O - https://repo.saltstack.com/apt/ubuntu/14.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+echo "deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/2016.3 trusty main" >/etc/apt/sources.list.d/saltstack.list
apt-get -y install salt-minion
mkdir -m700 -p /etc/salt/pki/minion
diff --git a/ubuntu-16.04/scripts/salt.sh b/ubuntu-16.04/scripts/salt.sh
index fbee3a0..a3c97b7 100644
--- a/ubuntu-16.04/scripts/salt.sh
+++ b/ubuntu-16.04/scripts/salt.sh
@@ -1,2 +1,4 @@
+wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
+echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3 xenial main" >/etc/apt/sources.list.d/saltstack.list
apt-get -y install salt-minion
mkdir -m700 -p /etc/salt/pki/minion