Skip to content
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.

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

replace claranet/timezone with puppet/systemd #2103

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions puppet/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@ gem 'puppet-lint-version_comparison-check', require: false
gem 'puppet-syntax', require: false
gem 'rspec-puppet', require: false
gem 'rspec-puppet-facts', require: false

gem 'facterdb', '~> 2.0', require: false
1 change: 0 additions & 1 deletion puppet/Puppetfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
moduledir 'external_modules'

mod 'citrin/htpasswd', '1.0.2'
mod 'claranet/timezone', '2.0.1'
mod 'puppet/archive', '7.1.0'
mod 'puppet/augeasproviders_core', '4.1.0'
mod 'puppet/augeasproviders_mounttab', '4.0.0'
Expand Down
2 changes: 2 additions & 0 deletions puppet/data/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -237,3 +237,5 @@ sudo::wheel_config: password
redmine::https: true

apache::default_vhost: false

systemd::timezone: UTC
2 changes: 1 addition & 1 deletion puppet/modules/profiles/manifests/base.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
include motd
include puppet
include ssh
include timezone
include systemd
include unattended
if $facts['os']['family'] == 'RedHat' {
package { 'ntp':
Expand Down
6 changes: 3 additions & 3 deletions puppet/spec/classes/jenkins_node_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
end
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_users__account('jenkins').with_sudo(false) }
if facts[:osfamily] == 'Debian'
if facts[:os]['family'] == 'Debian'
it { is_expected.to contain_class('sudo') }
it { is_expected.to contain_sudo__conf('sudo-puppet-jenkins').with_content('jenkins ALL=NOPASSWD: ALL') }
else
it { is_expected.not_to contain_class('sudo') }
end

if facts[:osfamily] == 'Debian'
if facts[:os]['family'] == 'Debian'
it { is_expected.to contain_file('/etc/pbuilder/bullseye64/hooks/A10nozstd').with_ensure('absent') }
it { is_expected.to contain_file('/etc/pbuilder/jammy64/hooks/A10nozstd').with_ensure('present') }
it { is_expected.to contain_file('/etc/pbuilder/bullseye64/hooks/C10foremanlog').with_ensure('present') }
Expand Down Expand Up @@ -49,7 +49,7 @@
it { is_expected.to contain_package('jq') }
end

if facts[:osfamily] == 'RedHat'
if facts[:os]['family'] == 'RedHat'
context "unittest only node" do
let(:params) do
{uploader: false, packaging: false, unittests: true}
Expand Down