From e47c42bdf32239b7bb65383763d03314dcc65465 Mon Sep 17 00:00:00 2001
From: Olivier Blin <dev@blino.org>
Date: Tue, 21 Feb 2017 08:55:38 +0100
Subject: Use concat from stdlib to add arm32 arch in iurt/upload.conf

This avoids hardcoding the x86 arch list one more time.

We already use puppet-stdlib for the file_line and concat helpers.
---
 deployment/mga_buildsystem/manifests/config.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'deployment')

diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 6859367f..d0c66879 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -65,8 +65,10 @@ class mga_buildsystem::config {
         }
     }
 
+    include stdlib
+
     $std_arch = ['i586', 'x86_64']
-    $std_arch_with_arm32 = [ 'i586', 'x86_64', 'armv5tl', 'armv7hl' ]
+    $arm32_arch = ['armv5tl', 'armv7hl']
     $std_repos = {
         'release' => {
             'media_type'  => [ 'release' ],
@@ -537,7 +539,7 @@ class mga_buildsystem::config {
         default_distro => 'cauldron',
         distros        => {
             'cauldron' => {
-                'arch'                => $std_arch_with_arm32,
+                'arch'                => concat($std_arch, $arm32_arch),
                 'mandatory_arch'      => $std_arch,
                 'no_media_cfg_update' => true,
                 'medias'              => $std_medias,
-- 
cgit v1.2.1