Skip to content

Commit

Permalink
Merge pull request #7983 from joshcooper/64x_master_mergeup
Browse files Browse the repository at this point in the history 
(maint) Merge 6.4.x to master
  • Loading branch information
@joshcooper
joshcooper committed Feb 12, 2020
2 parents 2b84935 + b11ecb9 commit 6e66cdb
Show file tree
Hide file tree
Showing 9 changed files with 146 additions and 57 deletions.
7 changes: 5 additions & 2 deletions lib/puppet.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
require 'puppet/external/pson/version'
require 'puppet/external/pson/pure'
require 'puppet/gettext/config'
require 'puppet/defaults'


#------------------------------------------------------------
Expand Down Expand Up @@ -95,6 +96,7 @@ def self.[](param)

# Store a new default value.
def self.define_settings(section, hash)
Puppet.deprecation_warning('The method Puppet.define_settings is deprecated and will be removed in a future release')
@@settings.define_settings(section, hash)
end

Expand Down Expand Up @@ -129,8 +131,9 @@ def self.run_mode
Puppet::Util::RunMode[@@settings.preferred_run_mode]
end

# Load all of the settings.
require 'puppet/defaults'
# Modify the settings with defaults defined in `initialize_default_settings` method in puppet/defaults.rb. This can
# be used in the initialization of new Puppet::Settings objects in the puppetserver project.
Puppet.initialize_default_settings!(settings)

# Now that settings are loaded we have the code loaded to be able to issue
# deprecation warnings. Warn if we're on a deprecated ruby version.
Expand Down
112 changes: 66 additions & 46 deletions lib/puppet/defaults.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,30 @@ def self.default_vendormoduledir

AS_DURATION = %q{This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y).}

define_settings(:main,
:facterng => {
# @api public
# @param args [Puppet::Settings] the settings object to define default settings for
# @return void
def self.initialize_default_settings!(settings)
settings.define_settings(:main,
:facterng => {
:default => false,
:type => :boolean,
:desc => 'Whether to enable a pre-Facter 4.0 release of Facter (distributed as
the "facter-ng" gem). This is not necessary if Facter 3.x or later is installed.
This setting is still experimental.',
:hook => proc do |value|
if value
begin
ORIGINAL_FACTER = Object.const_get(:Facter)
Object.send(:remove_const, :Facter)
require 'facter-ng'
rescue LoadError
Object.const_set(:Facter, ORIGINAL_FACTER)
raise ArgumentError, 'facter-ng could not be loaded'
end
end
end
}
)

define_settings(:main,
if value
begin
original_facter = Object.const_get(:Facter)
Object.send(:remove_const, :Facter)
require 'facter-ng'
rescue LoadError
Object.const_set(:Facter, original_facter)
raise ArgumentError, 'facter-ng could not be loaded'
end
end
end
},
:confdir => {
:default => nil,
:type => :directory,
Expand Down Expand Up @@ -124,7 +125,7 @@ def self.default_vendormoduledir
}
)

define_settings(:main,
settings.define_settings(:main,
:logdir => {
:default => nil,
:type => :directory,
Expand Down Expand Up @@ -228,7 +229,7 @@ def self.default_vendormoduledir
}
)

define_settings(:main,
settings.define_settings(:main,
:priority => {
:default => nil,
:type => :priority,
Expand Down Expand Up @@ -551,12 +552,12 @@ def self.default_vendormoduledir
:hiera_config => {
:default => lambda do
config = nil
codedir = Puppet.settings[:codedir]
codedir = settings[:codedir]
if codedir.is_a?(String)
config = File.expand_path(File.join(codedir, 'hiera.yaml'))
config = nil unless Puppet::FileSystem.exist?(config)
end
config = File.expand_path(File.join(Puppet.settings[:confdir], 'hiera.yaml')) if config.nil?
config = File.expand_path(File.join(settings[:confdir], 'hiera.yaml')) if config.nil?
config
end,
:desc => "The hiera configuration file. Puppet only reads this file on startup, so you must restart the puppet master every time you edit it.",
Expand Down Expand Up @@ -620,7 +621,7 @@ def self.default_vendormoduledir
:http_proxy_password =>{
:default => "none",
:hook => proc do |value|
if Puppet.settings[:http_proxy_password] =~ /[@!# \/]/
if settings[:http_proxy_password] =~ /[@!# \/]/
raise "Passwords set in the http_proxy_password setting must be valid as part of a URL, and any reserved characters must be URL-encoded. We received: #{value}"
end
end,
Expand Down Expand Up @@ -764,7 +765,7 @@ def self.default_vendormoduledir
}
)

Puppet.define_settings(:module_tool,
settings.define_settings(:module_tool,
:module_repository => {
:default => 'https://forgeapi.puppet.com',
:desc => "The module repository",
Expand All @@ -783,7 +784,7 @@ def self.default_vendormoduledir
}
)

Puppet.define_settings(
settings.define_settings(
:main,

# We have to downcase the fqdn, because the current ssl stuff (as opposed to in master) doesn't have good facilities for
Expand Down Expand Up @@ -1094,7 +1095,7 @@ def self.default_vendormoduledir
}
)

define_settings(
settings.define_settings(
:ca,
:ca_name => {
:default => "Puppet CA: $certname",
Expand Down Expand Up @@ -1212,7 +1213,7 @@ def self.default_vendormoduledir

# Define the config default.

define_settings(:application,
settings.define_settings(:application,
:config_file_name => {
:type => :string,
:default => Puppet::Settings.default_config_file_name,
Expand All @@ -1237,7 +1238,7 @@ def self.default_vendormoduledir
},
)

define_settings(:environment,
settings.define_settings(:environment,
:manifest => {
:default => nil,
:type => :file_or_directory,
Expand Down Expand Up @@ -1280,7 +1281,7 @@ def self.default_vendormoduledir
}
)

define_settings(:master,
settings.define_settings(:master,
:user => {
:default => "puppet",
:desc => "The user Puppet Server will run as. Used to ensure
Expand Down Expand Up @@ -1337,13 +1338,23 @@ def self.default_vendormoduledir
overridden by more specific settings (see `ca_port`, `report_port`).",
},
:node_name => {
:default => "cert",
:default => 'cert',
:type => :enum,
:values => ['cert', 'facter'],
:deprecated => :completely,
:hook => proc { |val|
if val != 'cert'
Puppet.deprecation_warning("The node_name setting is deprecated and will be removed in a future release.")
end
},
:desc => "How the puppet master determines the client's identity
and sets the 'hostname', 'fqdn' and 'domain' facts for use in the manifest,
in particular for determining which 'node' statement applies to the client.
Possible values are 'cert' (use the subject's CN in the client's
certificate) and 'facter' (use the hostname that the client
reported in its facts)",
reported in its facts).
This setting is deprecated, please use explicit fact matching for classification.",
},
:bucketdir => {
:default => "$vardir/bucket",
Expand Down Expand Up @@ -1466,14 +1477,23 @@ def self.default_vendormoduledir
:desc => "Where the fileserver configuration is stored.",
},
:strict_hostname_checking => {
:default => false,
:default => true,
:type => :boolean,
:desc => "Whether to only search for the complete
hostname as it is in the certificate when searching for node information
in the catalogs.",
hostname as it is in the certificate when searching for node information
in the catalogs or to match dot delimited segments of the cert's certname
and the hostname, fqdn, and/or domain facts.
This setting is deprecated and will be removed in a future release.",
:hook => proc { |val|
if val != true
Puppet.deprecation_warning("Setting strict_hostname_checking to false is deprecated and will be removed in a future release. Please use regular expressions in your node declarations or explicit fact matching for classification (though be warned that fact based classification may be considered insecure).")
end
}
}
)

define_settings(:device,
settings.define_settings(:device,
:devicedir => {
:default => "$vardir/devices",
:type => :directory,
Expand All @@ -1488,7 +1508,7 @@ def self.default_vendormoduledir
}
)

define_settings(:agent,
settings.define_settings(:agent,
:node_name_value => {
:default => "$certname",
:desc => "The explicit value used for the node name for all requests the agent
Expand Down Expand Up @@ -1841,7 +1861,7 @@ def self.default_vendormoduledir

# Plugin information.

define_settings(
settings.define_settings(
:main,
:plugindest => {
:type => :directory,
Expand Down Expand Up @@ -1884,7 +1904,7 @@ def self.default_vendormoduledir

# Central fact information.

define_settings(
settings.define_settings(
:main,
:factpath => {
:type => :path,
Expand All @@ -1901,7 +1921,7 @@ def self.default_vendormoduledir
}
)

define_settings(
settings.define_settings(
:transaction,
:tags => {
:default => "",
Expand Down Expand Up @@ -1929,7 +1949,7 @@ def self.default_vendormoduledir
}
)

define_settings(
settings.define_settings(
:main,
:external_nodes => {
:default => "none",
Expand All @@ -1954,7 +1974,7 @@ def self.default_vendormoduledir
}
)

define_settings(
settings.define_settings(
:ldap,
:ldapssl => {
:default => false,
Expand Down Expand Up @@ -2023,7 +2043,7 @@ def self.default_vendormoduledir
}
)

define_settings(:master,
settings.define_settings(:master,
:storeconfigs => {
:default => false,
:type => :boolean,
Expand All @@ -2041,7 +2061,7 @@ def self.default_vendormoduledir
require 'puppet/node/facts'
if value
Puppet::Resource::Catalog.indirection.set_global_setting(:cache_class, :store_configs)
Puppet.settings.override_default(:catalog_cache_terminus, :store_configs)
settings.override_default(:catalog_cache_terminus, :store_configs)
Puppet::Node::Facts.indirection.set_global_setting(:cache_class, :store_configs)
Puppet::Resource.indirection.set_global_setting(:terminus_class, :store_configs)
end
Expand All @@ -2056,7 +2076,7 @@ def self.default_vendormoduledir
}
)

define_settings(:parser,
settings.define_settings(:parser,
:max_errors => {
:default => 10,
:desc => <<-'EOT'
Expand Down Expand Up @@ -2108,7 +2128,7 @@ def self.default_vendormoduledir
EOT
}
)
define_settings(:puppetdoc,
settings.define_settings(:puppetdoc,
:document_all => {
:default => false,
:type => :boolean,
Expand All @@ -2117,7 +2137,7 @@ def self.default_vendormoduledir
}
)

define_settings(
settings.define_settings(
:main,
:rich_data => {
:default => true,
Expand All @@ -2134,5 +2154,5 @@ def self.default_vendormoduledir
EOT
}
)

end
end
4 changes: 4 additions & 0 deletions lib/puppet/network/http/connection.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@ def do_request(request, options)
current_request[header] = value
end
when 429, 503
if connection.started?
Puppet.debug("Closing connection for #{current_site}")
connection.finish
end
response = handle_retry_after(current_response)
else
response = current_response
Expand Down
1 change: 1 addition & 0 deletions lib/puppet/network/http/nocache_pool.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ def with_connection(site, verifier, &block)
begin
yield http
ensure
return unless http.started?
Puppet.debug("Closing connection for #{site}")
http.finish
end
Expand Down
6 changes: 5 additions & 1 deletion lib/puppet/network/http/pool.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def with_connection(site, verifier, &block)
reuse = false
raise detail
ensure
if reuse
if reuse && http.started?
release(site, verifier, http)
else
close_connection(site, http)
Expand All @@ -56,13 +56,17 @@ def pool
end

# Safely close a persistent connection.
# Don't try to close a connection that's already closed.
#
# @api private
def close_connection(site, http)
return false unless http.started?
Puppet.debug("Closing connection for #{site}")
http.finish
true
rescue => detail
Puppet.log_exception(detail, _("Failed to close connection for %{site}: %{detail}") % { site: site, detail: detail })
nil
end

# Borrow and take ownership of a persistent connection. If a new
Expand Down
Loading

0 comments on commit 6e66cdb

Please sign in to comment.