diff options
| author | Olivier Blin <dev@blino.org> | 2017-02-21 08:55:38 +0100 |
|---|---|---|
| committer | Olivier Blin <dev@blino.org> | 2017-02-21 08:55:38 +0100 |
| commit | e47c42bdf32239b7bb65383763d03314dcc65465 (patch) | |
| tree | cbb26f9350d07ff6d08b67656701a6b5ccfdca89 /deployment | |
| parent | 0f4bc9aa8b7a45015ee54e62c76c62f93d766f9b (diff) | |
| download | puppet-e47c42bdf32239b7bb65383763d03314dcc65465.tar puppet-e47c42bdf32239b7bb65383763d03314dcc65465.tar.gz puppet-e47c42bdf32239b7bb65383763d03314dcc65465.tar.bz2 puppet-e47c42bdf32239b7bb65383763d03314dcc65465.tar.xz puppet-e47c42bdf32239b7bb65383763d03314dcc65465.zip | |
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.
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 6 |
1 files changed, 4 insertions, 2 deletions
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, |