From 544ff4f35b2b449d25272a8805bbb4c7f748f1d4 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 9 Aug 2018 13:49:13 +0400 Subject: Update Salt version to 2017.7 Salt 2016.x has a bug with states ordering coming from 'include' statement. Glance/Heat DB sync is applied before package setup although clearly specified 'require' in state. Change-Id: Ic5f7ce4a7623fb208c0a5ba366802b7e02fa8b9f Signed-off-by: Michael Polenchuk --- mcp/scripts/salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/scripts') diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 6a250dd67..46ef6ffbf 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -85,7 +85,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END export DEBIAN_FRONTEND=noninteractive echo 'Dpkg::Use-Pty "0";' > /etc/apt/apt.conf.d/90silence-dpkg OLD_DOMAIN=\$(grep -sPzo "id: cfg01\.\K(\S*)" /etc/salt/minion.d/minion.conf) || true - BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \ + BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2017.7 " \ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \ EXTRA_FORMULAS="nfs panko gnocchi oslo-templates" \ ./salt-master-init.sh -- cgit 1.2.3-korg