Revert "Enforced salt version 2016.3 for ubuntu"
This reverts commit ed7877f09fd5c26600f97a4352199010cb78ec71.
Change-Id: Ia26abacde04d39964a79cb3a6e47345990a8f4af
diff --git a/ubuntu-14.04/scripts/base.sh b/ubuntu-14.04/scripts/base.sh
index 5a33ab9..68c295b 100644
--- a/ubuntu-14.04/scripts/base.sh
+++ b/ubuntu-14.04/scripts/base.sh
@@ -9,12 +9,9 @@
apt-get -y install curl wget tmux vim-nox byobu iputils-ping traceroute htop tree
# Add apt-mk repository
-echo "deb [arch=amd64] http://apt-mk.mirantis.com/trusty/ nightly extra salt" > /etc/apt/sources.list.d/apt-mk.list
+echo "deb [arch=amd64] http://apt-mk.mirantis.com/trusty/ nightly extra salt salt-latest" > /etc/apt/sources.list.d/apt-mk.list
curl -sf http://apt-mk.mirantis.com/public.gpg | 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
-wget -O - https://repo.saltstack.com/apt/ubuntu/14.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub | apt-key add -
-
# Cleanup old kernels, ensure latest is installed via virtual package
apt-get purge -y linux-image-* linux-headers-*
if [ ! -f /tmp/no_install_kernel ]; then