diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-10 20:43:16 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-12 00:21:59 +0200 |
| commit | 1f12aa33bc4088f846986188795fc6a41fa191e0 (patch) | |
| tree | 9cf250a85c0bd5080cfecef747f9a2152b5d9d00 /mcp/scripts/salt.sh | |
| parent | c2269d2ed4f55ec051c058dc6b733f74d0d3eec3 (diff) | |
salt-master-init.sh: Use stable 2016.11 salt ver
The <salt-master-init.sh> script default to using stable 2016.3
version of Salt via BOOTSTRAP_SALTSTACK_OPTS.
However, since we manually add the 2016.11 repos beforehand, the
correct version (2016.11) ends up being installed.
This change merely drops one uselss repo from salt master apt sources.
While at it, use HTTPS for repo.saltstack.com DEB repository.
Since we already add the repo to apt sources via <user-data.sh>,
pass "-r" on all architectures, skipping repo (re)addition.
Change-Id: I7fbe0b646b2f2a8e952718a61ff8c180116f8f27
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/scripts/salt.sh')
| -rwxr-xr-x | mcp/scripts/salt.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 20971804d..7f2c3cac7 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -45,11 +45,9 @@ 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 - if [ "\$(uname -i)" = "aarch64" ]; then - # NOTE(armband): On AArch64, skip creating apt source list definitions (-r) - export BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " - fi - 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 \ + ./salt-master-init.sh salt-key -Ay cp -r ${OPNFV_FUEL_DIR}/mcp/salt-formulas/* /usr/share/salt-formulas/env |