[salt] Retire Armband Saltstack repos

[armband.git] / patches / reclass-system-salt-model / 0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch

diff --git a/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch b/patches/reclass-system-salt-model/0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch
similarity index 64%
rename from patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch
rename to patches/reclass-system-salt-model/0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch
index a595509..1500f67 100644 (file)
--- a/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch
+++ b/patches/reclass-system-salt-model/0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch
@@ -1,5 +1,5 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Enea AB and others.
+: 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
@@ -8,22 +8,28 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Sun, 26 Nov 2017 17:55:13 +0100
-Subject: [PATCH] linux.system.repo.glusterfs: Add arm64 arch
+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 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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 fb331f0..ffad938 100644
+index fb331f0f..4646c075 100644
 --- a/linux/system/repo/glusterfs.yml
 +++ b/linux/system/repo/glusterfs.yml
-@@ -6,6 +6,6 @@ parameters:
+@@ -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
-+          architectures: amd64,arm64
            key_id: 3FE869A9
            key_server: keyserver.ubuntu.com