Skip to content

Replace puppet-agent with openvox-agent #765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willaerk merged 4 commits into from
Jan 20, 2026
Merged

Replace puppet-agent with openvox-agent #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d567d81
Add openvox repository and make sure puppet repository is unavailable
willaerk Jan 15, 2026
e685387
Use openvox-agent instead of puppet-agent package
willaerk Jan 15, 2026
6e854e4
Purge the puppet-agent package for clarity
willaerk Jan 20, 2026
f954671
Merge branch 'main' into feature/OPS-1445
willaerk Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions manifests/apt/repositories.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,7 @@
}

@apt::source { 'puppet':
location => "https://apt-mirror.publiq.be/puppet-${codename}-${environment}",
release => $codename,
architecture => $arch,
repos => 'puppet'
ensure => 'absent'
}

@apt::source { 'hashicorp':
Expand All @@ -142,6 +139,13 @@
repos => 'main'
}

@apt::source { 'openvox':
location => "https://apt-mirror.publiq.be/openvox-${codename}-${environment}",
release => $codename,
architecture => $arch,
repos => 'main'
}

# Project repositories
@apt::source { 'uit-mail-subscriptions':
location => "https://apt.publiq.be/uit-mail-subscriptions-${environment}",
Expand Down
14 changes: 10 additions & 4 deletions manifests/puppet/agent.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,31 @@
}

realize Apt::Source['puppet']
realize Apt::Source['openvox']
realize File['/etc/puppetlabs/facter/facts.d']

package { 'puppet-agent':
package { 'openvox-agent':
ensure => $version,
require => [Apt::Source['puppet'], File['/etc/puppetlabs/facter/facts.d']],
require => [Apt::Source['openvox'], File['/etc/puppetlabs/facter/facts.d']],
notify => Service['puppet']
}

package { 'puppet-agent':
ensure => 'purged',
require => Package['openvox-agent']
}

file { 'puppet agent production environment hiera.yaml':
ensure => 'absent',
path => '/etc/puppetlabs/code/environments/production/hiera.yaml',
require => Package['puppet-agent']
require => Package['openvox-agent']
}

file { 'puppet agent production environment datadir':
ensure => 'absent',
path => '/etc/puppetlabs/code/environments/production/data',
force => true,
require => Package['puppet-agent']
require => Package['openvox-agent']
}

if $puppetserver {
Expand Down
7 changes: 6 additions & 1 deletion spec/classes/apt/repositories_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
include_examples 'apt repositories', 'focal-updates', { :location => 'https://apt-mirror.publiq.be/focal-updates-amd64-testing', :repos => 'main', :release => 'focal-updates' }
include_examples 'apt repositories', 'focal-security', { :location => 'https://apt-mirror.publiq.be/focal-security-amd64-testing', :repos => 'main', :release => 'focal-security' }
include_examples 'apt repositories', 'focal-backports', { :location => 'https://apt-mirror.publiq.be/focal-backports-amd64-testing', :repos => 'main', :release => 'focal-backports' }
include_examples 'apt repositories', 'puppet', { :location => 'https://apt-mirror.publiq.be/puppet-focal-testing', :repos => 'puppet', :release => 'focal' }
include_examples 'apt repositories', 'php', { :location => 'https://apt-mirror.publiq.be/php-focal-testing', :repos => 'main', :release => 'focal' }

# Do we need to check for the architecture for these repositories?
Expand All @@ -60,6 +59,7 @@
include_examples 'apt repositories', 'elastic-5.x', { :location => 'https://apt-mirror.publiq.be/elastic-5.x-testing', :repos => 'main', :release => 'stable' }
include_examples 'apt repositories', 'elastic-8.x', { :location => 'https://apt-mirror.publiq.be/elastic-8.x-testing', :repos => 'main', :release => 'stable' }
include_examples 'apt repositories', 'hashicorp', { :location => 'https://apt-mirror.publiq.be/hashicorp-focal-testing', :repos => 'main', :release => 'focal' }
include_examples 'apt repositories', 'openvox', { :location => 'https://apt-mirror.publiq.be/openvox-focal-testing', :repos => 'main', :release => 'focal' }

include_examples 'apt repositories', 'publiq-jenkins', { :location => 'https://apt.publiq.be/publiq-jenkins-testing', :repos => 'main', :release => 'focal' }
include_examples 'apt repositories', 'publiq-prototypes', { :location => 'https://apt.publiq.be/publiq-prototypes-testing', :repos => 'main', :release => 'focal' }
Expand Down Expand Up @@ -102,6 +102,7 @@
include_examples 'apt repositories', 'uit-frontend', { :location => 'https://apt.publiq.be/uit-frontend-testing', :repos => 'main', :release => 'focal' }
include_examples 'apt repositories', 'uit-api', { :location => 'https://apt.publiq.be/uit-api-testing', :repos => 'main', :release => 'focal' }
include_examples 'apt repositories', 'uit-cms', { :location => 'https://apt.publiq.be/uit-cms-testing', :repos => 'main', :release => 'focal' }

end

context 'in the acceptance environment' do
Expand All @@ -114,6 +115,10 @@

include_examples 'apt repositories', 'focal', { :location => 'https://apt-mirror.publiq.be/focal-amd64-acceptance', :repos => 'main', :release => 'focal' }
include_examples 'apt repositories', 'php', { :location => 'https://apt-mirror.publiq.be/php-focal-acceptance', :repos => 'main', :release => 'focal' }

it { is_expected.to contain_apt__source('puppet').with(
'ensure' => 'absent'
) }
end
end
end
Expand Down
16 changes: 9 additions & 7 deletions spec/classes/puppet/agent_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
) }

it { is_expected.to contain_apt__source('puppet') }
it { is_expected.to contain_apt__source('openvox') }

it { is_expected.to contain_package('puppet-agent').with(
it { is_expected.to contain_package('openvox-agent').with(
'ensure' => 'installed'
) }

Expand Down Expand Up @@ -72,11 +73,12 @@
'value' => 'store',
) }

it { is_expected.to contain_apt__source('puppet').that_comes_before('Package[puppet-agent]') }
it { is_expected.to contain_package('puppet-agent').that_requires('File[/etc/puppetlabs/facter/facts.d]') }
it { is_expected.to contain_package('puppet-agent').that_notifies('Service[puppet]') }
it { is_expected.to contain_file('puppet agent production environment hiera.yaml').that_requires('Package[puppet-agent]') }
it { is_expected.to contain_file('puppet agent production environment datadir').that_requires('Package[puppet-agent]') }
it { is_expected.to contain_apt__source('puppet') }
it { is_expected.to contain_apt__source('openvox').that_comes_before('Package[openvox-agent]') }
it { is_expected.to contain_package('openvox-agent').that_requires('File[/etc/puppetlabs/facter/facts.d]') }
it { is_expected.to contain_package('openvox-agent').that_notifies('Service[puppet]') }
it { is_expected.to contain_file('puppet agent production environment hiera.yaml').that_requires('Package[openvox-agent]') }
it { is_expected.to contain_file('puppet agent production environment datadir').that_requires('Package[openvox-agent]') }
it { is_expected.to contain_ini_setting('agent certificate_revocation').that_notifies('Service[puppet]') }
it { is_expected.to contain_ini_setting('agent usecacheonfailure').that_notifies('Service[puppet]') }
it { is_expected.to contain_ini_setting('agent reports').that_notifies('Service[puppet]') }
Expand All @@ -92,7 +94,7 @@

it { is_expected.to compile.with_all_deps }

it { is_expected.to contain_package('puppet-agent').with(
it { is_expected.to contain_package('openvox-agent').with(
'ensure' => '6.23.1'
) }

Expand Down