diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-arch-common')
4 files changed, 18 insertions, 7 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml index d6f4fb563..268f09ae6 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/backports.yml @@ -7,16 +7,27 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.apt_mirantis.openstack + - system.linux.system.repo.keystorage.mirantis_com + - cluster.all-mcp-arch-common.uca_repo parameters: _param: - backports_version: queens + backports_version: rocky linux: system: repo: - mirantis_openstack_backports: + mirantis_openstack: # yamllint disable-line rule:line-length - source: "deb ${_param:linux_system_repo_url}/openstack-${_param:backports_version}/${_param:linux_system_codename} ${_param:linux_system_codename} main" + source: "deb ${_param:linux_system_repo_url}/openstack-${_param:backports_version}/xenial xenial main" key: ${_param:linux_system_repo_mirror_mirantis_key} architectures: ${_param:linux_system_architecture} clean_file: true + pinning: + 10: + enabled: true + pin: 'release o=Mirantis' + priority: 1101 + package: '/jinja2|redis/' + 20: + enabled: true + pin: 'release o=Mirantis' + priority: 1 diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 index f735a9db0..17a89f0e8 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 @@ -64,7 +64,7 @@ parameters: tenant_address: {{ nm.net_private | ipnet_hostaddr(pri) }} external_address: {{ nm.net_public | ipnet_hostaddr(pub) }} salt_master_host: ${_param:reclass_config_master} - linux_system_codename: xenial + linux_system_codename: bionic {#- No partial defaults, all or nothing. Defaults tuned for lf-pod2. #} {%- if '-ovs-' in conf.MCP_DEPLOY_SCENARIO or '-fdio-' in conf.MCP_DEPLOY_SCENARIO %} diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 index cd8b2fb6a..f9c2f20ec 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 @@ -13,7 +13,7 @@ classes: - cluster.all-mcp-arch-common.passwords parameters: _param: - openstack_version: rocky + openstack_version: stein armband_repo_version: ${_param:openstack_version} mcp_version: nightly diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/uca_repo.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/uca_repo.yml index 9c806560f..2ca6f01d4 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/uca_repo.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/uca_repo.yml @@ -12,7 +12,7 @@ parameters: repo: uca: # yamllint disable-line rule:line-length - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" + source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu ${_param:linux_system_codename}-updates/${_param:openstack_version} main" key: | -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1 |