Skip to content

Commit 946a422

Browse files
evgeniekohl
authored andcommitted
default to theforeman.foreman.foreman callback on all Debians
1 parent 67a68df commit 946a422

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

manifests/plugin/ansible/params.pp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
$runner_package_name = 'ansible-runner'
1919
}
2020
'Debian': {
21-
if ($facts['os']['name'] == 'Ubuntu') {
22-
$callback = 'theforeman.foreman.foreman'
23-
} else {
24-
$callback = 'foreman'
25-
}
21+
$callback = 'theforeman.foreman.foreman'
2622
$runner_package_name = 'python3-ansible-runner'
2723
}
2824
default: {

spec/classes/foreman_proxy__plugin__ansible_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
end
3232

3333
it 'should configure ansible.env' do
34-
callback = facts[:os]['family'] == 'RedHat' ? 'theforeman.foreman.foreman' : 'foreman'
34+
callback = 'theforeman.foreman.foreman'
3535
verify_exact_contents(catalogue, '/etc/foreman-proxy/ansible.env', [
3636
"export ANSIBLE_CALLBACK_WHITELIST=\"#{callback}\"",
3737
"export ANSIBLE_CALLBACKS_ENABLED=\"#{callback}\"",
@@ -78,7 +78,7 @@
7878
end
7979

8080
it 'should configure ansible.env' do
81-
callback = facts[:os]['family'] == 'RedHat' ? 'theforeman.foreman.foreman' : 'foreman'
81+
callback = 'theforeman.foreman.foreman'
8282
verify_exact_contents(catalogue, '/etc/foreman-proxy/ansible.env', [
8383
"export ANSIBLE_CALLBACK_WHITELIST=\"#{callback}\"",
8484
"export ANSIBLE_CALLBACKS_ENABLED=\"#{callback}\"",

0 commit comments

Comments
 (0)