diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-08-09 13:49:13 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-08-09 13:50:07 +0400 |
| commit | 544ff4f35b2b449d25272a8805bbb4c7f748f1d4 (patch) | |
| tree | d57a095be1115be7617aa72b653ec64367f3b417 /mcp/reclass/classes/cluster | |
| parent | ff8fe897ccaf4c70a5c68114d8a647d59edd75ba (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: Ic5f7ce4a7623fb208c0a5ba366802b7e02fa8b9f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster')
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 index 4e9323b68..b4afdd9d1 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 @@ -151,7 +151,7 @@ parameters: network_discovery: 'enabled' default_min_hwe_kernel: ${_param:hwe_kernel} cluster: - saltstack_repo_xenial: "deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/ xenial main" + saltstack_repo_xenial: "deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/ xenial main" linux: network: interface: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 index c518d381f..59d75d478 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 @@ -14,7 +14,7 @@ parameters: _param: apt_mk_version: nightly mcp_repo_version: 1.1 - salt_version: 2016.11 + salt_version: 2017.7 cluster_domain: ${_param:cluster_name}.local # stacklight_environment: ${_param:cluster_domain} reclass_data_revision: master |