aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config/scenario/defaults.yaml
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-29 19:11:18 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-29 19:23:33 +0200
commitefec10f8e81336b101a931f0195493d863858302 (patch)
treea3ee39e28eecf07df30fb22affb6aa32d3e6f183 /mcp/config/scenario/defaults.yaml
parent1ca86212e3d22debdabc113e809ee2d9ea702259 (diff)
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: Icc2769f38567072ffa223f715443930f0c18dd1b Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config/scenario/defaults.yaml')
-rw-r--r--mcp/config/scenario/defaults.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml
index 4e689df57..2f8ea6010 100644
--- a/mcp/config/scenario/defaults.yaml
+++ b/mcp/config/scenario/defaults.yaml
@@ -14,10 +14,10 @@ x86_64:
common:
apt:
keys:
- - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub
+ - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub
repos:
# <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
- - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
+ - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main
pkg:
install:
- linux-generic-hwe-16.04
@@ -36,10 +36,10 @@ 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
+ - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub
repos:
# <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp>
- - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
+ - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main
- armband 1201 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike-armband main
pkg:
install: