X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fscripts%2Fsalt.sh;h=1ea8f5b8e583f2af9571595789567dff7e6f70ed;hb=c2b84a6b0b9df4a831ffa5f948afacd9fe1bb48a;hp=9378b6c4332652a7ae12a4f9758bb1a92f328c1a;hpb=de6a685915bc8bd5444217bca511da35c94b4d59;p=fuel.git

diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 9378b6c43..1ea8f5b8e 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -1,38 +1,72 @@
 #!/bin/bash
+##############################################################################
+# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 #
 # Deploy Salt Master
 #
 
+F_GIT_ROOT=$(git rev-parse --show-toplevel)
+OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel"
+OPNFV_FUEL_DIR="/root/fuel"
+OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common"
+LOCAL_PDF_RECLASS=$1
+
+# push to cfg01 current git repo first (including submodules), at ~ubuntu/fuel
+# later we move it to ~root/fuel and delete the temporary clone
+rsync -Erl --delete -e "ssh ${SSH_OPTS}" \
+  --exclude-from="${F_GIT_ROOT}/.gitignore" \
+  "${F_GIT_ROOT}/" "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/"
+if [ -n "${LOCAL_PDF_RECLASS}" ] && [ -f "${LOCAL_PDF_RECLASS}" ]; then
+  rsync -e "ssh ${SSH_OPTS}" "${LOCAL_PDF_RECLASS}" \
+    "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/mcp/${OPNFV_RDIR}/opnfv/"
+fi
+
 # ssh to cfg01
-ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END
+# shellcheck disable=SC2086,2087
+ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
   sudo -i
 
   echo -n 'Checking out cloud-init has finished running ...'
   while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo -n '.'; sleep 1; done
   echo ' done'
 
-  apt-get install -y git curl subversion
+  mkdir -p /srv/salt /usr/share/salt-formulas/reclass
+  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/${OPNFV_RDIR} && ln -s "\$(uname -i)" arch
 
-  svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts
-  git clone --depth=1 --recurse-submodules https://git.opnfv.org/fuel
-  ln -s /root/fuel/mcp/reclass /srv/salt/reclass
+  cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass
+  cd /srv/salt/reclass/classes/service && \
+    ln -s /usr/share/salt-formulas/reclass/service/opendaylight
+  cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass
 
   cd /srv/salt/scripts
-  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 \
+      EXTRA_FORMULAS="nfs" \
+        ./salt-master-init.sh
   salt-key -Ay
 
-  cp -r /root/fuel/mcp/metadata/service /usr/share/salt-formulas/reclass
-  cp -r /root/fuel/mcp/salt-formulas/* /usr/share/salt-formulas/env
-  cd /srv/salt/reclass/classes/service && ln -s /usr/share/salt-formulas/reclass/service/opendaylight
-
-  salt '*' saltutil.refresh_pillar
-  salt '*' saltutil.sync_all
+  cp -r ${OPNFV_FUEL_DIR}/mcp/salt-formulas/* /usr/share/salt-formulas/env
+  cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list formulas
 
   salt-call state.apply salt
-  salt '*' state.apply salt || salt '*' state.apply salt
+  salt '*' saltutil.sync_all
+  salt '*' state.apply salt | fgrep -q 'No response' && salt '*' state.apply salt
 
   salt -C 'I@salt:master' state.sls linux
   salt -C '* and not cfg01*' state.sls linux
+  salt -C '* and not cfg01*' pkg.upgrade refresh=False
 
   salt '*' state.sls ntp
+
+  # Temporary fixup for mismatch between neutron formula and reclass model
+  salt-call pkg.install salt-formula-neutron allow_updates=False refresh=False \
+    version=2016.12.1+201709251458.f0607d9-1xenial1
 SALT_INSTALL_END