From: Michael Polenchuk Date: Tue, 8 Aug 2017 07:38:39 +0000 (+0400) Subject: Switch distrib revision to testing X-Git-Tag: opnfv-5.0.RC1~149 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F38885%2F2;p=fuel.git Switch distrib revision to testing In order to avoid bleeding edge issues with nightly version of salt formulas, switch to "safe" testing repo source. Change-Id: I9d12f337c3952711cb8843943c23315795064016 Signed-off-by: Michael Polenchuk --- diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index 6320d70d5..e0ea6a295 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit 6320d70d52fda38b989dfdb91621f52c16f27f97 +Subproject commit e0ea6a295634951cc7e7f51d7652c50f2401605e diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 3d0fb9117..ae64143c5 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -48,7 +48,7 @@ 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 - MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./salt-master-init.sh + MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=testing ./salt-master-init.sh salt-key -Ay cp -r ${OPNFV_FUEL_DIR}/mcp/salt-formulas/* /usr/share/salt-formulas/env