aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-10 15:47:00 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-12 20:38:12 +0100
commit630168005568fff7ec59e66527412b05a51a060b (patch)
tree4ff6537621342d0f4de06bc046d199f69159dd8b /mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch
parent04e17a04227f81fe38dc6e37f9ffe4af5252fea1 (diff)
[patch] Drop reclass.system patch for repo arch
MCP repos no longer publish arm64 metadata, so drop our patch that selected arm64 metadata on arm64 systems. Instead, let it default to 'deb [arch=amd64]', which will allow arm64 systems to fetch amd64 metadata and inherintely fetch all arch-independent packages from the same repos. While at it, switch to 'rocky-armband' repos on arm64 systems. Change-Id: I07fda895f5162bfa576c62336cbb4d74e985f37a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch')
-rw-r--r--mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch76
1 files changed, 76 insertions, 0 deletions
diff --git a/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch
new file mode 100644
index 000000000..dbb127406
--- /dev/null
+++ b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Fix-archive-key-URL.patch
@@ -0,0 +1,76 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 7 Jun 2018 21:19:07 +0200
+Subject: [PATCH] linux.system.repo: Fix archive key URL
+
+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
+--- a/keystone/client/os_client_config/admin_identity.yml
++++ b/keystone/client/os_client_config/admin_identity.yml
+@@ -9,7 +9,7 @@ parameters:
+ clouds:
+ admin_identity:
+ region_name: ${_param:openstack_region}
+- identity_api_version: '3'
++ identity_api_version: 3
+ interface: 'internal'
+ auth:
+ username: 'admin'
+diff --git a/keystone/client/v3/service/heat.yml b/keystone/client/v3/service/heat.yml
+index 6c45bfe2..f1d500c7 100644
+--- a/keystone/client/v3/service/heat.yml
++++ b/keystone/client/v3/service/heat.yml
+@@ -6,6 +6,9 @@ parameters:
+ client:
+ resources:
+ v3:
++ domains:
++ heat_user_domain:
++ description: 'Contains users and projects created by heat'
+ roles:
+ heat_stack_user:
+ name: heat_stack_user
+@@ -21,6 +24,14 @@ parameters:
+ service_admin:
+ name: admin
+ project_id: service
++ heat_domain_admin:
++ password: ${_param:heat_domain_admin_password}
++ email: ${_param:admin_email}
++ roles:
++ heat_stack_admin:
++ name: admin
++ role_domain_id: heat_user_domain
++ domain_id: heat_user_domain
+ services:
+ 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..f7048f74 100644
+--- a/linux/system/repo/mcp/mirror/v1/openstack.yml
++++ b/linux/system/repo/mcp/mirror/v1/openstack.yml
+@@ -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}
+ 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
+ pin:
+ - pin: 'release o=Mirantis'
+ priority: 1100