aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-10 17:05:09 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-10 19:05:47 +0200
commitf15d0275832e59c4e2ac16fa9c066b5771b26dfb (patch)
tree3cbf5be40b07b1a78e4049857cc8d86feca9cafc /mcp/config
parent111e21e54a6b5a29f19e504fddfaf03b7370175e (diff)
AArch64: Switch to upstream Saltstack repo
To work around the missing dependency of 'python-tornado' on 'python-features' provided by the binary-specific DEB package in amd64 Saltstack repository, pre-install the req explicitly on FN (jumpserver) and VCP VMs via lib.sh. JIRA: ARMBAND-382 Change-Id: I2dbd08a58f6cf57c2c48c2d7fc8d19ad4872e800 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config')
-rw-r--r--mcp/config/scenario/defaults.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml
index 13f2dd527..110ffc704 100644
--- a/mcp/config/scenario/defaults.yaml
+++ b/mcp/config/scenario/defaults.yaml
@@ -36,14 +36,16 @@ aarch64:
apt:
keys:
- https://linux.enea.com/mcp-repos/pike/xenial/archive-mcppike.key
+ - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub
repos:
# <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
- - saltstack 500 deb [arch=arm64] http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/2016.11 xenial main
+ - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
- armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike-armband main
pkg:
install:
- linux-image-generic-hwe-16.04-edge
- linux-headers-generic-hwe-16.04-edge
+ - python-futures
- salt-minion
control:
apt: ~