puppet 6.15.0-universal-darwin → 6.16.0-universal-darwin

data/man/man5/puppet.conf.5

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPETCONF" "5" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPETCONF" "5" "May 2020" "Puppet, Inc." "Puppet manual"
 \fBThis page is autogenerated; any changes will get overwritten\fR
 .
 .SH "Configuration settings"
@@ -920,7 +920,7 @@ The time to wait for data to be read from an HTTP connection\. If nothing is rea
 The HTTP User\-Agent string to send when making network requests\.
 .
 .IP "\(bu" 4
-\fIDefault\fR: Puppet/6\.15\.0 Ruby/2\.4\.1\-p111 (x86_64\-linux)
+\fIDefault\fR: Puppet/6\.16\.0 Ruby/2\.4\.1\-p111 (x86_64\-linux)
 .
 .IP "" 0
 .
@@ -1198,6 +1198,14 @@ The maximum amount of time the Puppet agent should wait for its certificate requ
 .
 .IP "" 0
 .
+.SS "maxwaitforlock"
+The maximum amount of time the puppet agent should wait for an already running puppet agent to finish before starting a new one\. This is set by default to 1 minute\. A value of \fBunlimited\fR will cause puppet agent to wait indefinitely\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: 1m
+.
+.IP "" 0
+.
 .SS "merge_dependency_warnings"
 Whether to merge class\-level dependency failure warnings\.
 .
@@ -2039,6 +2047,17 @@ Puppet agent cannot apply configurations until its approved certificate is avail
 .
 .IP "" 0
 .
+.SS "waitforlock"
+How frequently puppet agent should try running when there is an already ongoing puppet agent instance\.
+.
+.P
+This argument is by default disabled (value set to 0)\. In this case puppet agent will immediatly exit if it cannot run at that moment\. When a value other than 0 is set, this can also be used in combination with the \fBmaxwaitforlock\fR argument\. This setting can be a time interval in seconds (30 or 30s), minutes (30m), hours (6h), days (2d), or years (5y)\.
+.
+.IP "\(bu" 4
+\fIDefault\fR: 0
+.
+.IP "" 0
+.
 .SS "yamldir"
 The directory in which YAML data is stored, usually in a subdirectory\.
 .

data/man/man8/puppet-agent.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-AGENT" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-AGENT" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-agent\fR \- The puppet agent daemon

data/man/man8/puppet-apply.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-APPLY" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-APPLY" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-apply\fR \- Apply Puppet manifests locally

data/man/man8/puppet-catalog.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-CATALOG" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CATALOG" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-catalog\fR \- Compile, save, view, and convert catalogs\.

data/man/man8/puppet-config.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-CONFIG" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-CONFIG" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-config\fR \- Interact with Puppet\'s settings\.

data/man/man8/puppet-describe.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DESCRIBE" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DESCRIBE" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-describe\fR \- Display help about resource types

data/man/man8/puppet-device.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DEVICE" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DEVICE" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-device\fR \- Manage remote network devices

data/man/man8/puppet-doc.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-DOC" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-DOC" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-doc\fR \- Generate Puppet references

data/man/man8/puppet-epp.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-EPP" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-EPP" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-epp\fR \- Interact directly with the EPP template parser/renderer\.

data/man/man8/puppet-facts.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-FACTS" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FACTS" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-facts\fR \- Retrieve and store facts\.

data/man/man8/puppet-filebucket.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-FILEBUCKET" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-FILEBUCKET" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-filebucket\fR \- Store and retrieve files in a filebucket

data/man/man8/puppet-generate.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-GENERATE" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-GENERATE" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-generate\fR \- Generates Puppet code from Ruby definitions\.

data/man/man8/puppet-help.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-HELP" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-HELP" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-help\fR \- Display Puppet help\.
@@ -34,7 +34,7 @@ Whether to log debug information\.
 \fBSYNOPSIS\fR
 .
 .IP
-puppet help [\-\-version VERSION] [\fIsubcommand\fR] [\fIaction\fR]
+puppet help [\-\-version VERSION] [\-\-ronn] [\fIsubcommand\fR] [\fIaction\fR]
 .
 .IP
 \fBDESCRIPTION\fR
@@ -43,7 +43,10 @@ puppet help [\-\-version VERSION] [\fIsubcommand\fR] [\fIaction\fR]
 Display help about Puppet subcommands and their actions\.
 .
 .IP
-\fBOPTIONS\fR \fI\-\-version VERSION\fR \- The version of the subcommand for which to show help\.
+\fBOPTIONS\fR \fI\-\-ronn\fR \- Whether to render the help text in ronn format\.
+.
+.IP
+\fI\-\-version VERSION\fR \- The version of the subcommand for which to show help\.
 .
 .IP
 \fBRETURNS\fR

data/man/man8/puppet-key.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-KEY" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-KEY" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-key\fR \- Create, save, and remove certificate keys\.

data/man/man8/puppet-lookup.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "LOOKUP" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "LOOKUP" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBlookup\fR \- Interactive Hiera lookup

data/man/man8/puppet-man.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MAN" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MAN" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-man\fR \- Display Puppet manual pages\.

data/man/man8/puppet-module.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-MODULE" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-MODULE" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-module\fR \- Creates, installs and searches for modules on the Puppet Forge\.
@@ -170,6 +170,9 @@ puppet module search \fIsearch_term\fR
 \fBDESCRIPTION\fR
 .
 .IP
+This action has been deprecated\. Please use the Puppet Forge to search for modules\.
+.
+.IP
 Searches a repository for modules whose names, descriptions, or keywords match the provided search term\.
 .
 .IP

data/man/man8/puppet-node.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-NODE" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-NODE" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-node\fR \- View and manage node definitions\.

data/man/man8/puppet-parser.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PARSER" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PARSER" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-parser\fR \- Interact directly with the parser\.

data/man/man8/puppet-plugin.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-PLUGIN" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-PLUGIN" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-plugin\fR \- Interact with the Puppet plugin system\.

data/man/man8/puppet-report.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-REPORT" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-REPORT" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-report\fR \- Create, display, and submit reports\.

data/man/man8/puppet-resource.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-RESOURCE" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-RESOURCE" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-resource\fR \- The resource abstraction layer shell

data/man/man8/puppet-script.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SCRIPT" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SCRIPT" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-script\fR \- Run a puppet manifests as a script without compiling a catalog

data/man/man8/puppet-ssl.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-SSL" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-SSL" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-ssl\fR \- Manage SSL keys and certificates for puppet SSL clients

data/man/man8/puppet-status.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET\-STATUS" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET\-STATUS" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\-status\fR \- View puppet server status\.

data/man/man8/puppet.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "April 2020" "Puppet, Inc." "Puppet manual"
+.TH "PUPPET" "8" "May 2020" "Puppet, Inc." "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
@@ -25,4 +25,4 @@ Specialized:
 catalog Compile, save, view, and convert catalogs\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. node View and manage node definitions\. parser Interact directly with the parser\. plugin Interact with the Puppet plugin system\. script Run a puppet manifests as a script without compiling a catalog ssl Manage SSL keys and certificates for puppet SSL clients
 .
 .P
-See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v6\.15\.0
+See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v6\.16\.0

data/spec/fixtures/unit/provider/package/dnfmodule/{dnf-module-list-enabled.txt → dnf-module-list.txt}

@@ -9,5 +9,11 @@ postgresql   10 [d][e]    client, server [d] [i]                    PostgreSQL s
 ruby         2.5 [d][e]   common [d]                                An interpreter of object-oriented scripting language                  
 rust-toolset rhel8 [d][e] common [d] [i]                            Rust                                                               
 subversion   1.10 [d][e]  common [d], server [i]                    Apache Subversion                                                  
+scala        2.10 [d]     common [d]                                A hybrid functional/object-oriented language for the JVM
+squid        4 [d]        common [d]                                Squid - Optimising Web Delivery
+subversion   1.10 [d]     common [d], server                        Apache Subversion
+swig         3.0 [d][x]   common [d], complete                      Connects C/C++/Objective C to some high-level programming languages
+varnish      6 [d]        common [d]                                Varnish HTTP cache
+virt         rhel [d][x]  common [d]                                Virtualization module
 
 Hint: [d]efault, [e]nabled, [x]disabled, [i]nstalled

data/spec/fixtures/unit/provider/package/zypper/zypper-search-uninstalled.out

@@ -0,0 +1,13 @@
+Refreshing service 'spacewalk'.
+Problem retrieving the repository index file for service 'spacewalk':
+[|] This client is not registered to any spacewalk server.
+
+Skipping service 'spacewalk' because of the above error.
+Loading repository data...
+Reading installed packages...
+
+S | Name    | Type    | Version           | Arch   | Repository                                      
+--+---------+---------+-------------------+--------+-------------------------------------------------
+  | vim     | package | 1.0.20040813-19.9 | noarch | localmirror-os                                  
+  | vim     | package | 1.0.20040813-19.9 | noarch | localmirror-os                                  
+  | vim     | package | 1.0.20040813-19.9 | noarch | SUSE-Linux-Enterprise-Server-11-SP4 11.4.4-1.109

data/spec/integration/application/agent_spec.rb

@@ -267,7 +267,7 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
               agent.run
             }.to exit_with(4)
              .and output(/Notice: Applied catalog/).to_stdout
-             .and output(%r{Error: Could not retrieve file metadata for https://127.0.0.1:#{https_port}/path/to/file: .* certificate verify failed}).to_stderr
+             .and output(%r{Error: Could not retrieve file metadata for https://127.0.0.1:#{https_port}/path/to/file: certificate verify failed}).to_stderr
           end
 
           expect(File).to_not be_exist(path)
@@ -326,4 +326,69 @@ describe "puppet agent", unless: Puppet::Util::Platform.jruby? do
       end
     end
   end
+
+  context 'multiple agents running' do
+    it "exits if an agent is already running" do
+      path = Puppet[:agent_catalog_run_lockfile]
+
+      th = Thread.new {
+        %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(2)"}
+      }
+
+      until File.exists?(path) && File.size(path) > 0 do
+        sleep 0.1
+      end
+
+      expect {
+        agent.command_line.args << '--test'
+        agent.run
+      }.to exit_with(1).and output(/Run of Puppet configuration client already in progress; skipping/).to_stdout
+
+      th.kill # kill thread so we don't wait too much
+    end
+
+    it "waits for other agent run to finish before starting" do
+      server.start_server do |port|
+        path = Puppet[:agent_catalog_run_lockfile]
+        Puppet[:masterport] = port
+        Puppet[:waitforlock] = 1
+
+        th = Thread.new {
+          %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(2)"}
+        }
+
+        until File.exists?(path) && File.size(path) > 0 do
+          sleep 0.1
+        end
+
+        expect {
+          agent.command_line.args << '--test'
+          agent.run
+        }.to exit_with(0).and output(/Info: Will try again in #{Puppet[:waitforlock]} seconds./).to_stdout
+
+        th.kill # kill thread so we don't wait too much
+      end
+    end
+
+    it "exits if maxwaitforlock is exceeded" do
+      path = Puppet[:agent_catalog_run_lockfile]
+      Puppet[:waitforlock] = 1
+      Puppet[:maxwaitforlock] = 0
+
+      th = Thread.new {
+        %x{ruby -e "$0 = 'puppet'; File.write('#{path}', Process.pid); sleep(2)"}
+      }
+
+      until File.exists?(path) && File.size(path) > 0 do
+        sleep 0.1
+      end
+
+      expect {
+        agent.command_line.args << '--test'
+        agent.run
+      }.to exit_with(1).and output(/Exiting now because the maxwaitforlock timeout has been exceeded./).to_stdout
+
+      th.kill # kill thread so we don't wait too much
+    end
+  end
 end

data/spec/integration/application/plugin_spec.rb

@@ -47,4 +47,27 @@ describe "puppet plugin" do
     end
   end
 
+  it "downloads from an environment that doesn't exist locally" do
+    requested_environment = nil
+
+    current_version_handler = -> (req, res) {
+      res['X-Puppet-Version'] = Puppet.version
+      res['Content-Type'] = 'application/json'
+      res.body = response_body
+      requested_environment = req.query['environment']
+    }
+
+    server.start_server(mounts: {file_metadatas: current_version_handler}) do |port|
+      Puppet[:environment] = 'doesnotexistontheagent'
+      Puppet[:masterport] = port
+      expect {
+        plugin.command_line.args << 'download'
+        plugin.run
+      }.to exit_with(0)
+       .and output(matching("Downloaded these plugins")).to_stdout
+
+      expect(requested_environment).to eq('doesnotexistontheagent')
+    end
+  end
+
 end