Install missing python module of jsonschema

[fuel.git] / mcp / scripts / salt.sh

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 824cada..fc5c78e 100755 (executable)
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -69,6 +69,12 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
   cd /srv/salt/reclass/classes/service && \
     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
+  echo 'deb http://linux.enea.com/apt-mk/xenial nightly extra' > \
+    '/etc/apt/sources.list.d/armband_mcp_extra.list'
+  apt-get update
+
   cd /srv/salt/scripts
   export DEBIAN_FRONTEND=noninteractive
   echo 'Dpkg::Use-Pty "0";' > /etc/apt/apt.conf.d/90silence-dpkg
@@ -100,7 +106,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
   if [[ "${LOCAL_VIRT_NODES}" =~ mas ]]; then
     wait_for 3.0 'salt -C "mas*" test.ping'
   else
-    wait_for 3.0 'for n in ${LOCAL_VIRT_NODES}; do salt -C \${n}.* test.ping; done'
+    wait_for 3.0 '(for n in ${LOCAL_VIRT_NODES}; do salt -C \${n}.* test.ping || exit; done)'
   fi
   wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" saltutil.sync_all'
   wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" state.apply salt'