X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fscripts%2Fsalt.sh;h=aecfecea4eda48744773178cfc6c16e57c1305f8;hb=10a36807bc6ec0db532a93f6dbb2b42ec1c47617;hp=fc5c78e68c9e767fa1ea348a178c927c18fc1ca5;hpb=f80d30f56b5de482c2212c72808c04f72940a6d3;p=fuel.git

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index fc5c78e68..aecfecea4 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -63,6 +63,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
   ln -sf ${OPNFV_GIT_DIR}${F_GIT_SUBD} ${OPNFV_FUEL_DIR}
   ln -sf ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt
   ln -sf ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt
+  ln -sf ${OPNFV_FUEL_DIR}/mcp/scripts/mcp.rsa $(dirname "${OPNFV_FUEL_DIR}")
   cd /srv/salt/${OPNFV_RDIR} && rm -f arch && ln -sf "\$(uname -i)" arch
 
   cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass
@@ -70,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
@@ -113,6 +114,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
 
   wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.system,linux.storage'
   wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' || true
+  salt -C "E@^(${NODE_MASK}).*" state.sls opnfv.route_wrapper
   salt -C "E@^(${NODE_MASK}).*" system.reboot
   wait_for 90.0 'salt -C "E@^(${NODE_MASK}).*" test.ping'
   wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" pkg.upgrade refresh=False dist_upgrade=True'
@@ -123,8 +125,4 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
     mkdir -p "${OPNFV_VCP_DIR}"
     mv "${OPNFV_FUEL_DIR}/${OPNFV_VCP_IMG}" "${OPNFV_VCP_DIR}/"
   fi
-
-  # symlink manually until package with required commit is available
-  cd /usr/share/salt-formulas/env/aodh/files
-  ln -sf ocata pike
 SALT_INSTALL_END