diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-01-14 08:55:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-14 08:55:39 +0000 |
| commit | 85dbecaa4e7ef89d50653740ac82ecef4d684eb2 (patch) | |
| tree | b9f8bc721197bcb944bb9fc12f0eb371fd064d97 /mcp/patches | |
| parent | f7d02fdade36838dadcb1d08843037bafe68015a (diff) | |
| parent | 630168005568fff7ec59e66527412b05a51a060b (diff) | |
Merge "[patch] Drop reclass.system patch for repo arch"
Diffstat (limited to 'mcp/patches')
| -rw-r--r-- | mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch (renamed from mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch) | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch index 3d2605786..dbb127406 100644 --- a/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch +++ b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch @@ -8,19 +8,16 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Date: Thu, 7 Jun 2018 21:19:07 +0200 -Subject: [PATCH] linux.system.repo: Drop arch for mcp.mirror repo +Subject: [PATCH] linux.system.repo: Fix archive key URL -Extending the arch list to 'amd64,arm64' would lead to doubling repo -metadata downloads on all archs, while dropping it will allow APT to -only download the repo metadata for the current system arch. - -Setting the new linux_system_architectures is also problematic in the -context of mixed-architecture clusters. - -To keep old behavior for amd64 and prevent multiple downloads, let's -just drop the 'architectures' field. +While at it, fix keystone specifics for Rocky. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + keystone/client/os_client_config/admin_identity.yml | 2 +- + keystone/client/v3/service/heat.yml | 11 +++++++++++ + linux/system/repo/mcp/mirror/v1/openstack.yml | 2 +- + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/keystone/client/os_client_config/admin_identity.yml b/keystone/client/os_client_config/admin_identity.yml index d31db498..f6b6e5d6 100644 @@ -65,14 +62,12 @@ index 6c45bfe2..f1d500c7 100644 heat: type: orchestration diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml -index a4a369b2..12647495 100644 +index a4a369b2..f7048f74 100644 --- a/linux/system/repo/mcp/mirror/v1/openstack.yml +++ b/linux/system/repo/mcp/mirror/v1/openstack.yml -@@ -7,9 +7,8 @@ parameters: - repo: - mirantis_openstack: +@@ -9,7 +9,7 @@ parameters: source: "deb http://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename} ${_param:linux_system_codename} main" -- architectures: ${_param:linux_system_architecture} + architectures: ${_param:linux_system_architecture} clean_file: true - key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-${_param:openstack_version}.key + key_url: https://mirror.mirantis.com/${_param:apt_mk_version}/openstack-${_param:openstack_version}/${_param:linux_system_codename}/archive-openstack-${_param:openstack_version}.key |