diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-06-04 17:55:52 +0400 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-07 12:43:10 +0000 |
| commit | afae8d4d99d962448eb62cdd306f7a3dcda83744 (patch) | |
| tree | 09d568175957ab7155c327237313f0c3e542bcac /mcp/scripts/salt.sh | |
| parent | 78d368731c9582361cc291d5618e01702982f2b9 (diff) | |
[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 <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/scripts/salt.sh')
| -rwxr-xr-x | mcp/scripts/salt.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |