summaryrefslogtreecommitdiffstats
path: root/mcp/scripts/salt.sh
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-18 22:27:11 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-18 23:10:43 +0100
commit7481c6f499ea9f7949f1c0d9343d4e96caea6095 (patch)
tree25904a8921144e5e92bf14feee38a48670eab265 /mcp/scripts/salt.sh
parentf74f7bac151f69ae0b50f28e68805a5d8580736e (diff)
lib.sh: Skip modprobing nbd, loop if inbuilt
While at it, skip waiting for Salt master when deleting UEFI stale entries if it doesn't respond to ping. Also, use https for fetching Armband GPG key to bypass yet another hks issue behind proxies/firewalls that block hks port. Change-Id: I400cbe3257094b62c96b302a3c81c5ffd1ba4755 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/scripts/salt.sh')
-rwxr-xr-xmcp/scripts/salt.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index c5582f16d..aecfecea4 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -71,7 +71,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
ln -sf /usr/share/salt-formulas/reclass/service/opendaylight
# Armband APT-MK nightly/extra repo for forked & extended reclass
- apt-key adv --keyserver keys.gnupg.net --recv 798AB1D1
+ wget -qO - https://linux.enea.com/apt-mk/public.gpg | apt-key add -
echo 'deb http://linux.enea.com/apt-mk/xenial nightly extra' > \
'/etc/apt/sources.list.d/armband_mcp_extra.list'
apt-get update