File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change 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' ] )
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 ( [
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 ( [
You can’t perform that action at this time.
0 commit comments