diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-06-04 17:55:52 +0400 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-07 12:43:10 +0000 |
| commit | afae8d4d99d962448eb62cdd306f7a3dcda83744 (patch) | |
| tree | 09d568175957ab7155c327237313f0c3e542bcac /mcp/reclass/classes/cluster/mcp-pike-common-ha/infra | |
| parent | 78d368731c9582361cc291d5618e01702982f2b9 (diff) | |
[noha] Update OpenStack version to Queens
* make cluster names version-agnostic
* pre-install oslo-templates formula
* salt version update to 2017.7
* system reclass update
Change-Id: I903895f6bcd98a1062e66e3f14d23ec04dc1b869
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha/infra')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 index 7f3839e82..21639e3bc 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 @@ -15,7 +15,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 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml index 238ae95a3..793a7efa5 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml @@ -42,7 +42,7 @@ parameters: network_discovery: 'enabled' default_min_hwe_kernel: ${_param:hwe_kernel} cluster: - saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/ xenial main" + saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/ xenial main" linux: network: interface: |