summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-22 12:02:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-22 12:02:16 +0000
commitab31c13580dc51bb95d07627da5b19216ef2edff (patch)
tree40b609af283ee1fb0f7efe7610130ec11cff454f
parentf45309a760e04597bdb379f3c7a1c0a2b28e1f87 (diff)
parent7481c6f499ea9f7949f1c0d9343d4e96caea6095 (diff)
Merge "lib.sh: Skip modprobing nbd, loop if inbuilt"
-rw-r--r--mcp/scripts/lib.sh4
-rwxr-xr-xmcp/scripts/salt.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 7d57fcf5f..ce5db251f 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -38,10 +38,11 @@ function get_base_image {
function __kernel_modules {
# Load mandatory kernel modules: loop, nbd
local image_dir=$1
- sudo modprobe loop
+ test -e /dev/loop-control || sudo modprobe loop
if sudo modprobe nbd max_part=8 || sudo modprobe -f nbd max_part=8; then
return 0
fi
+ if [ -e /dev/nbd0 ]; then return 0; fi # nbd might be inbuilt
# CentOS (or RHEL family in general) do not provide 'nbd' out of the box
echo "[WARN] 'nbd' kernel module cannot be loaded!"
if [ ! -e /etc/redhat-release ]; then
@@ -225,6 +226,7 @@ function cleanup_mounts {
function cleanup_uefi {
# Clean up Ubuntu boot entry if cfg01, kvm nodes online from previous deploy
local cmd_str="ssh ${SSH_OPTS} ${SSH_SALT}"
+ ping -c 1 -w 1 "${SALT_MASTER}" || return 0
[ ! "$(hostname)" = 'cfg01' ] || cmd_str='eval'
${cmd_str} "sudo salt -C 'kvm* or cmp*' cmd.run \
\"which efibootmgr > /dev/null 2>&1 && \
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