[odl] Configure Odl memory requirements

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

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 82a73b3..aecfece 100755 (executable)
--- 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
@@ -124,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