misc update
Change-Id: I2b2c97c1da1ac60036525d067529010928279ec2
diff --git a/ubuntu-14.04/scripts/salt.sh b/ubuntu-14.04/scripts/salt.sh
index 4228bb8..8286c9b 100644
--- a/ubuntu-14.04/scripts/salt.sh
+++ b/ubuntu-14.04/scripts/salt.sh
@@ -1,14 +1,11 @@
#!/bin/bash -xe
SALTSTACK_REPO=${SALTSTACK_REPO:-"deb [arch=amd64] https://mirror.mirantis.com/stable/saltstack-2017.7/trusty/ trusty main"}
-SALTSTACK_GPG=${SALTSTACK_GPG:-"https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub"}
+SALTSTACK_GPG=${SALTSTACK_GPG:-"https://mirror.mirantis.com/proposed/saltstack-2017.7/trusty/SALTSTACK-GPG-KEY.pub"}
wget -O - ${SALTSTACK_GPG} | sudo apt-key add -
echo "${SALTSTACK_REPO}" > /etc/apt/sources.list.d/saltstack.list
-# We expect issues with GPG,related to our mirrors - so temporary disable check.
-echo "APT::Get::AllowUnauthenticated true;" > /etc/apt/apt.conf.d/99allow_unauthenticated
-
apt-get update
apt-get -y install salt-minion
mkdir -m700 -p /etc/salt/pki/minion
@@ -24,5 +21,4 @@
auth_timeout: 60
EOF
-rm -vf /etc/apt/apt.conf.d/99allow_unauthenticated
rm -vf /etc/apt/sources.list.d/saltstack.list