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.

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

pass options through env_vars if no control over init files #530

Merged
merged 9 commits into from
Mar 1, 2021
Merged

pass options through env_vars if no control over init files #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
902d980
check node exporter config file instead of bird in node exporter test
anarcat Feb 24, 2021
05e52b0
pass options through env_vars if no control over init files
anarcat Feb 23, 2021
3603499
purge env_file if unmanaged
anarcat Feb 23, 2021
a66fa3a
try to fix mysterious test failure
anarcat Feb 24, 2021
067c06c
env file is actualyl expected on Arch
anarcat Feb 24, 2021
e04a233
Merge branch 'node-exporter-spec' into no-init-env-options
anarcat Feb 24, 2021
c8211f4
another stab at making tests pass
anarcat Feb 24, 2021
ec09a92
install_method is actually *not* package on Arch for bird
anarcat Feb 24, 2021
e0ba8ff
cover the arch case correctly in tests for node exporter
anarcat Feb 24, 2021
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
26 changes: 24 additions & 2 deletions manifests/daemon.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,37 @@
'none': {}
}

unless $env_vars.empty {
if $init_style == 'none' and $install_method == 'package' {
$env_vars_merged = $env_vars + {
'ARGS' => $options,
}
} else {
$env_vars_merged = $env_vars
}

if $install_method == 'package' and $package_ensure in ['absent', 'purged'] {
# purge the environment file if the package is removed
#
# this is to make sure we can garbage-collect the files created by
# this module, when purging it.
file { "${env_file_path}/${name}":
ensure => absent,
}
} elsif $install_method == 'package' or !$env_vars_merged.empty {
# manage the environment file if the package is installed *or*, in
# any other case, if there's something to add to it
#
# the logic here is that the package-managed .service files *need*
# those files to be present, even if empty, so it's critical that
# the file not get removed
file { "${env_file_path}/${name}":
mode => '0644',
owner => 'root',
group => '0', # Darwin uses wheel
content => epp(
'prometheus/daemon.env.epp',
{
'env_vars' => $env_vars,
'env_vars' => $env_vars_merged,
}
),
notify => $notify_service,
Expand Down
8 changes: 6 additions & 2 deletions spec/classes/node_exporter_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,13 @@
end

if facts[:os]['family'] == 'RedHat'
it { is_expected.not_to contain_file('/etc/sysconfig/bird_exporter') }
it { is_expected.not_to contain_file('/etc/sysconfig/node_exporter') }
elsif facts[:os]['name'] == 'Archlinux'
it { is_expected.to contain_file('/etc/default/node_exporter') }
it { is_expected.not_to contain_file('/etc/sysconfig/node_exporter') }
else
it { is_expected.not_to contain_file('/etc/default/bird_exporter') }
it { is_expected.not_to contain_file('/etc/default/node_exporter') }
it { is_expected.not_to contain_file('/etc/sysconfig/node_exporter') }
end
end

Expand Down