Skip to content

Commit 285e62f

Browse files
committed
Disable FIPS on EL8+
1 parent d501ee3 commit 285e62f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

manifests/server/puppetserver.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
Optional[Integer[1]] $max_open_files = $puppet::server::max_open_files,
146146
Optional[Stdlib::Absolutepath] $versioned_code_id = $puppet::server::versioned_code_id,
147147
Optional[Stdlib::Absolutepath] $versioned_code_content = $puppet::server::versioned_code_content,
148-
Boolean $disable_fips = $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8',
148+
Boolean $disable_fips = $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] != '7',
149149
Array[String[1]] $jolokia_metrics_allowlist = $puppet::server::jolokia_metrics_allowlist,
150150
) {
151151
include puppet::server

spec/classes/puppet_server_puppetserver_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
.with_incl('/etc/default/puppetserver')
5656
.with_lens('Shellvars.lns')
5757
}
58-
if facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] == '8'
58+
if facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] != '7'
5959
it {
6060
should contain_augeas('puppet::server::puppetserver::jvm')
6161
.with_changes(['set JAVA_ARGS \'"-Xms2G -Xmx2G -Dcom.redhat.fips=false"\'', 'set JAVA_BIN /usr/bin/java'])
@@ -385,7 +385,7 @@
385385
.with_changes(['set puppetserver_java_opts \'"-Xms2G -Xmx2G -XX:foo=bar -XX:bar=foo"\''])
386386
.with_context('/files/etc/rc.conf')
387387
}
388-
elsif facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] == '8'
388+
elsif facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] != '7'
389389
it {
390390
should contain_augeas('puppet::server::puppetserver::jvm')
391391
.with_changes([
@@ -412,7 +412,7 @@
412412

413413
describe 'with cli_args parameter', unless: facts[:osfamily] == 'FreeBSD' do
414414
let(:params) { super().merge(server_jvm_cli_args: '-Djava.io.tmpdir=/var/puppettmp') }
415-
if facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] == '8'
415+
if facts[:os]['family'] == 'RedHat' and facts[:os]['release']['major'] != '7'
416416
it {
417417
should contain_augeas('puppet::server::puppetserver::jvm')
418418
.with_changes([

0 commit comments

Comments
 (0)