Skip to content

Commit

Permalink
Set external core to true for EL-based distributions
Browse files Browse the repository at this point in the history
  • Loading branch information
adamruzicka committed Jun 11, 2019
1 parent 58ab572 commit 075d5f3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
5 changes: 4 additions & 1 deletion manifests/plugin/dynflow/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@
$ssl_disabled_ciphers = undef
$tls_disabled_versions = undef
$open_file_limit = 1000000
$external_core = undef
$external_core = $facts['osfamily'] ? {
'RedHat' => true,
default => undef
}
}
12 changes: 8 additions & 4 deletions spec/classes/foreman_proxy__plugin__dynflow_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@
it { should contain_foreman_proxy__plugin('dynflow') }

it 'should generate correct dynflow.yml' do
verify_exact_contents(catalogue, "#{etc_dir}/foreman-proxy/settings.d/dynflow.yml", [
lines = [
'---',
':enabled: https',
':database: ',
':core_url: https://foo.example.com:8008',
])
]
lines << ':external_core: true' if has_core
verify_exact_contents(catalogue,
"#{etc_dir}/foreman-proxy/settings.d/dynflow.yml",
lines)
end

if has_core
Expand Down Expand Up @@ -78,7 +82,7 @@
:ssl_disabled_ciphers => ['NULL-MD5', 'NULL-SHA'],
:tls_disabled_versions => ['1.1'],
:open_file_limit => 8000,
:external_core => true,
:external_core => false,
} end

it { should compile.with_all_deps }
Expand Down Expand Up @@ -118,7 +122,7 @@
':enabled: https',
':database: /var/lib/foreman-proxy/dynflow/dynflow.sqlite',
':core_url: https://foo.example.com:8008',
':external_core: true',
':external_core: false',
])
end
else
Expand Down

0 comments on commit 075d5f3

Please sign in to comment.