From afae8d4d99d962448eb62cdd306f7a3dcda83744 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 4 Jun 2018 17:55:52 +0400 Subject: [noha] Update OpenStack version to Queens * make cluster names version-agnostic * pre-install oslo-templates formula * salt version update to 2017.7 * system reclass update Change-Id: I903895f6bcd98a1062e66e3f14d23ec04dc1b869 Signed-off-by: Michael Polenchuk --- mcp/scripts/salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mcp/scripts/salt.sh') diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 2224d660a..14581bacb 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -80,9 +80,9 @@ 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" \ + EXTRA_FORMULAS="nfs panko gnocchi oslo-templates" \ ./salt-master-init.sh salt-key -Ay -- cgit 1.2.3-korg