X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=patches%2Freclass-system-salt-model%2F0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch;fp=patches%2Freclass-system-salt-model%2F0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch;h=0000000000000000000000000000000000000000;hb=a62523998d00efed4bf0a5f368624a8193947ada;hp=1500f674964aad03bcb36fc9a89724b73f35d532;hpb=73161ee4be1766447a1f54e122f857caef307c8a;p=armband.git

diff --git a/patches/reclass-system-salt-model/0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch b/patches/reclass-system-salt-model/0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch
deleted file mode 100644
index 1500f674..00000000
--- a/patches/reclass-system-salt-model/0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch
+++ /dev/null
@@ -1,35 +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 fb331f0f..4646c075 100644
---- a/linux/system/repo/glusterfs.yml
-+++ b/linux/system/repo/glusterfs.yml
-@@ -6,6 +6,5 @@ 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