From e821b9398a5a998bec0143d56efb93018b8bcd8c Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Thu, 20 Dec 2018 15:32:48 +0400
Subject: Pull out rocky patches

This commit should be reverted once original formulas
get required support of rocky version.

Change-Id: Ia3458381bced0cae8dbfacc9781c90933ad5c822
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 ...system.repo-Drop-arch-for-mcp.mirror-repo.patch | 81 ++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch

(limited to 'mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch')

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-Drop-arch-for-mcp.mirror-repo.patch
new file mode 100644
index 000000000..3d2605786
--- /dev/null
+++ b/mcp/patches/reclass-system-salt-model/0003-linux.system.repo-Drop-arch-for-mcp.mirror-repo.patch
@@ -0,0 +1,81 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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: Drop arch for mcp.mirror repo
+
+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.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+
+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..12647495 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:
+           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
-- 
cgit 1.2.3-korg