From cf923d2da51f9ce3fddacfe34f1568b24620c2cc Mon Sep 17 00:00:00 2001 From: deepakt7340 Date: Tue, 23 Dec 2025 03:14:13 +0530 Subject: [PATCH 1/2] testing recurse in file resources --- modules/enableit/eit_files/manifests/file.pp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/enableit/eit_files/manifests/file.pp b/modules/enableit/eit_files/manifests/file.pp index 9c6fe081..b3b69ace 100644 --- a/modules/enableit/eit_files/manifests/file.pp +++ b/modules/enableit/eit_files/manifests/file.pp @@ -18,6 +18,7 @@ Optional[Stdlib::Unixpath] $target = undef, Optional[Stdlib::AbsolutePath] $ensure_mount = undef, Eit_types::Noop_Value $noop_value = undef, + Optional[Boolean] $recurse = true, ) { if $source and $content { @@ -37,6 +38,7 @@ content => $content, target => $target, noop => $noop_value, + recurse => $recurse, } $_obmondo_file = if $source { From 8c9e72b4a6a81569895a6a72f8f76644a7e7fd94 Mon Sep 17 00:00:00 2001 From: deepakt7340 Date: Thu, 25 Dec 2025 20:31:47 +0530 Subject: [PATCH 2/2] Fix: Update architecture logic to support multi-arch via extra_arch --- modules/enableit/common/manifests/repo.pp | 19 ++++++++++++++---- modules/enableit/eit_files/manifests/file.pp | 2 -- .../files/apt/ubuntu-archive-keyring.gpg | Bin 0 -> 7399 bytes 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 modules/enableit/eit_repos/files/apt/ubuntu-archive-keyring.gpg diff --git a/modules/enableit/common/manifests/repo.pp b/modules/enableit/common/manifests/repo.pp index 75aa12cc..daf6f902 100644 --- a/modules/enableit/common/manifests/repo.pp +++ b/modules/enableit/common/manifests/repo.pp @@ -62,6 +62,7 @@ Enum['http', 'https'] $source_protocol = 'https', Boolean $local = false, Optional[Stdlib::Fqdn] $domain = undef, + Optional[Array] $extra_arch = ['armhf'], Optional[Eit_types::Date] $snapshot = undef, ) { File { @@ -72,11 +73,17 @@ } # Get the architecture - $architecture = $facts['os']['architecture'] ? { + $fact_arch = $facts['os']['architecture'] ? { 'aarch64' => 'arm64', default => 'amd64', } + # Final architecture list + $architecture = $extra_arch.empty ? { + true => [$fact_arch], + false => unique([$fact_arch] + $extra_arch), + } + if $manage { class { 'eit_repos': purge => $purge, @@ -156,11 +163,15 @@ } } 'Debian': { + $arch = $facts['os']['architecture'] ? { + 'aarch64' => 'arm64', + default => 'amd64', + } $aptrepos.each |$key, $value| { apt::source { $key: ensure => present, noop => $noop_value, - architecture => $architecture, + architecture => $arch, release => $_os_codename, comment => "${key} repo server", location => $value['url'].inline_epp({ snapshot => $snapshot, }), @@ -281,7 +292,7 @@ apt::source { "local_apt_repo_${_os_codename}-${repo}": ensure => present, noop => $noop_value, - architecture => $architecture, + architecture => $architecture.join(','), release => "${_os_codename}-${repo}", comment => "local apt ${_os_codename}-${repo} server", location => "https://${domain}/${_snapshot_uri_fragment}apt/${apt_repo}", @@ -296,7 +307,7 @@ apt::source { "local_apt_repo_${_os_codename}": ensure => present, noop => $noop_value, - architecture => $architecture, + architecture => $architecture.join(','), release => $_os_codename, comment => 'local apt repo server', location => "https://${domain}/${_snapshot_uri_fragment}apt/${apt_repo}", diff --git a/modules/enableit/eit_files/manifests/file.pp b/modules/enableit/eit_files/manifests/file.pp index b3b69ace..9c6fe081 100644 --- a/modules/enableit/eit_files/manifests/file.pp +++ b/modules/enableit/eit_files/manifests/file.pp @@ -18,7 +18,6 @@ Optional[Stdlib::Unixpath] $target = undef, Optional[Stdlib::AbsolutePath] $ensure_mount = undef, Eit_types::Noop_Value $noop_value = undef, - Optional[Boolean] $recurse = true, ) { if $source and $content { @@ -38,7 +37,6 @@ content => $content, target => $target, noop => $noop_value, - recurse => $recurse, } $_obmondo_file = if $source { diff --git a/modules/enableit/eit_repos/files/apt/ubuntu-archive-keyring.gpg b/modules/enableit/eit_repos/files/apt/ubuntu-archive-keyring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..bb22338544fe6d4c7698048f4ba5b4533c6ec74a GIT binary patch literal 7399 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 Rb>xybNuxjY{Qa>3{uc{#j-&tp literal 0 HcmV?d00001