Skip to content

Commit 1f07dc4

Browse files
authored
Merge pull request #8319 from joshcooper/confine_puppetserver_gem_fips
(PUP-10604) Guard against JRuby FIPS
2 parents 8f4c33f + e6a74e4 commit 1f07dc4

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

lib/puppet/provider/package/puppetserver_gem.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
require 'rubygems/commands/list_command'
1+
unless Puppet::Util::Platform.jruby_fips?
2+
require 'rubygems/commands/list_command'
3+
end
24
require 'stringio'
35
require 'uri'
46

@@ -15,6 +17,8 @@
1517
has_feature :versionable, :install_options, :uninstall_options
1618

1719
confine :feature => :hocon
20+
# see SERVER-2578
21+
confine :fips_enabled => false
1822

1923
# Define the default provider package command name, as the parent 'gem' provider is targetable.
2024
# Required by Puppet::Provider::Package::Targetable::resource_or_provider_command

0 commit comments

Comments
 (0)