X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fscripts%2Fsalt.sh;h=7f2c3cac7012d3e23c463ffe93c8e3a2849413a2;hb=b30697a84ce41ee20a8b6070acda60f3a5cfac26;hp=70b5757a8ad4590d9293c95496f41e70f76784c6;hpb=978fd9da91b6cdd522e79a4b8c31cf8f800222a3;p=fuel.git

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 70b5757a8..7f2c3cac7 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -11,13 +11,11 @@
 #
 
 F_GIT_ROOT=$(git rev-parse --show-toplevel)
-SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu}
-SSH_SALT="${SALT_MASTER_USER}@${SALT_MASTER}"
 OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel"
 OPNFV_FUEL_DIR="/root/fuel"
 
 # patch reclass-system-salt-model locally before copying it over
-make -C "${F_GIT_ROOT}/mcp/patches" patches-import
+make -C "${F_GIT_ROOT}/mcp/patches" deepclean patches-import
 
 # push to cfg01 current git repo first (including submodules), at ~ubuntu/fuel
 # later we move it to ~root/fuel and delete the temporary clone
@@ -38,6 +36,8 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
   mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR}
   ln -s ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt/reclass
   ln -s ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt/scripts
+  cd /srv/salt/reclass/classes/cluster/all-mcp-ocata-common && \
+    ln -s "\$(uname -i)" arch
 
   cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass
   cd /srv/salt/reclass/classes/service && \
@@ -45,11 +45,9 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
   cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass
 
   cd /srv/salt/scripts
-  if [ "\$(uname -i)" = "aarch64" ]; then
-    # NOTE(armband): On AArch64, skip creating apt source list definitions (-r)
-    export BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 "
-  fi
-  MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./salt-master-init.sh
+  BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \
+    MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \
+      ./salt-master-init.sh
   salt-key -Ay
 
   cp -r ${OPNFV_FUEL_DIR}/mcp/salt-formulas/* /usr/share/salt-formulas/env