From 544ff4f35b2b449d25272a8805bbb4c7f748f1d4 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 9 Aug 2018 13:49:13 +0400 Subject: 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: Ic5f7ce4a7623fb208c0a5ba366802b7e02fa8b9f Signed-off-by: Michael Polenchuk --- mcp/config/scenario/defaults.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mcp/config') diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml index 05e86965e..f5640f71c 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: # deb [arch=] - - 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/queens/xenial/archive-mcpqueens.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: # deb [arch=] - - 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/queens/xenial queens-armband main pkg: install: -- cgit 1.2.3-korg