Update system reclass model

In order to get tacker definitions and latest changes.

Change-Id: Ib5bf5034f140e708fb596dd4b622f0b2bdee8a59
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

2 files changed, 0 insertions, 69 deletions

diff --git a/mcp/patches/reclass-system-salt-model/0003-system.repo-Pin-glusterfs-with-higher-prio.patch b/mcp/patches/reclass-system-salt-model/0003-system.repo-Pin-glusterfs-with-higher-prio.patch
deleted file mode 100644
index 91219f6fa..000000000
--- a/mcp/patches/reclass-system-salt-model/0003-system.repo-Pin-glusterfs-with-higher-prio.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: 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: Mon, 18 Jun 2018 15:53:31 +0200
-Subject: [PATCH] system.repo: Pin glusterfs with higher prio
-
-When both glusterfs PPA repo and MCP repos are used on the same node,
-the MCP repos used to take priority and install a predefined version
-no matter the configuration for GlusterFS PPA.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- linux/system/repo/glusterfs.yml | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml
-index fb331f0f..71d063ac 100644
---- a/linux/system/repo/glusterfs.yml
-+++ b/linux/system/repo/glusterfs.yml
-@@ -9,3 +9,7 @@ parameters:
-           architectures: amd64
-           key_id: 3FE869A9
-           key_server: keyserver.ubuntu.com
-+          pin:
-+          - package: '*'
-+            pin: release o=LP-PPA-gluster-glusterfs-${_param:glusterfs_version}
-+            priority: 1100
diff --git a/mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-glusterfs-repo.patch b/mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-glusterfs-repo.patch
deleted file mode 100644
index 458cf3bfe..000000000
--- a/mcp/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-glusterfs-repo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: 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: Sun, 26 Nov 2017 17:55:13 +0100
-Subject: [PATCH] linux.system.repo: Drop arch for glusterfs 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.
-
-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>
----
- linux/system/repo/glusterfs.yml | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml
-index 71d063ac..9afe553c 100644
---- a/linux/system/repo/glusterfs.yml
-+++ b/linux/system/repo/glusterfs.yml
-@@ -6,7 +6,6 @@ parameters:
-       repo:
-         glusterfs-ppa:
-           source: "deb http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu ${_param:linux_system_codename} main"
--          architectures: amd64
-           key_id: 3FE869A9
-           key_server: keyserver.ubuntu.com
-           pin: