puppet 6.18.0 → 6.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (144) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +8 -10
  3. data/README.md +1 -2
  4. data/Rakefile +4 -12
  5. data/lib/puppet/agent/locker.rb +0 -7
  6. data/lib/puppet/application/agent.rb +8 -3
  7. data/lib/puppet/application/doc.rb +1 -1
  8. data/lib/puppet/application/lookup.rb +5 -5
  9. data/lib/puppet/configurer.rb +39 -7
  10. data/lib/puppet/defaults.rb +55 -29
  11. data/lib/puppet/environments.rb +51 -10
  12. data/lib/puppet/face/catalog.rb +1 -1
  13. data/lib/puppet/face/config.rb +46 -16
  14. data/lib/puppet/face/node.rb +3 -3
  15. data/lib/puppet/face/node/clean.rb +2 -2
  16. data/lib/puppet/face/status.rb +1 -1
  17. data/lib/puppet/file_bucket/dipper.rb +1 -1
  18. data/lib/puppet/functions/new.rb +8 -3
  19. data/lib/puppet/http.rb +1 -0
  20. data/lib/puppet/http/client.rb +1 -1
  21. data/lib/puppet/http/resolver.rb +5 -8
  22. data/lib/puppet/http/resolver/server_list.rb +18 -36
  23. data/lib/puppet/http/resolver/settings.rb +4 -4
  24. data/lib/puppet/http/resolver/srv.rb +5 -5
  25. data/lib/puppet/http/service.rb +3 -1
  26. data/lib/puppet/http/service/compiler.rb +1 -1
  27. data/lib/puppet/http/service/file_server.rb +1 -1
  28. data/lib/puppet/http/service/puppetserver.rb +39 -0
  29. data/lib/puppet/http/session.rb +5 -4
  30. data/lib/puppet/indirector/catalog/compiler.rb +1 -1
  31. data/lib/puppet/indirector/facts/yaml.rb +1 -1
  32. data/lib/puppet/indirector/json.rb +1 -1
  33. data/lib/puppet/indirector/msgpack.rb +1 -1
  34. data/lib/puppet/indirector/request.rb +4 -4
  35. data/lib/puppet/indirector/yaml.rb +1 -1
  36. data/lib/puppet/network/http/api/master/v3/environments.rb +0 -1
  37. data/lib/puppet/node/facts.rb +17 -0
  38. data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb +1 -3
  39. data/lib/puppet/pops/evaluator/runtime3_converter.rb +2 -2
  40. data/lib/puppet/pops/types/p_meta_type.rb +1 -1
  41. data/lib/puppet/pops/types/p_type_set_type.rb +4 -0
  42. data/lib/puppet/provider/package/dpkg.rb +1 -1
  43. data/lib/puppet/provider/package/pip2.rb +17 -0
  44. data/lib/puppet/provider/package/puppetserver_gem.rb +180 -0
  45. data/lib/puppet/provider/package/yum.rb +1 -0
  46. data/lib/puppet/resource/type.rb +2 -1
  47. data/lib/puppet/rest/route.rb +2 -2
  48. data/lib/puppet/settings.rb +19 -5
  49. data/lib/puppet/transaction/report.rb +11 -7
  50. data/lib/puppet/type/file/source.rb +1 -1
  51. data/lib/puppet/type/filebucket.rb +1 -1
  52. data/lib/puppet/util/connection.rb +8 -8
  53. data/lib/puppet/util/run_mode.rb +5 -1
  54. data/lib/puppet/version.rb +1 -1
  55. data/locales/puppet.pot +153 -156
  56. data/man/man5/puppet.conf.5 +29 -13
  57. data/man/man8/puppet-agent.8 +6 -3
  58. data/man/man8/puppet-apply.8 +1 -1
  59. data/man/man8/puppet-catalog.8 +1 -1
  60. data/man/man8/puppet-config.8 +6 -6
  61. data/man/man8/puppet-describe.8 +1 -1
  62. data/man/man8/puppet-device.8 +1 -1
  63. data/man/man8/puppet-doc.8 +1 -1
  64. data/man/man8/puppet-epp.8 +1 -1
  65. data/man/man8/puppet-facts.8 +1 -1
  66. data/man/man8/puppet-filebucket.8 +1 -1
  67. data/man/man8/puppet-generate.8 +1 -1
  68. data/man/man8/puppet-help.8 +1 -1
  69. data/man/man8/puppet-key.8 +1 -1
  70. data/man/man8/puppet-lookup.8 +1 -1
  71. data/man/man8/puppet-man.8 +1 -1
  72. data/man/man8/puppet-module.8 +1 -1
  73. data/man/man8/puppet-node.8 +4 -4
  74. data/man/man8/puppet-parser.8 +1 -1
  75. data/man/man8/puppet-plugin.8 +1 -1
  76. data/man/man8/puppet-report.8 +1 -1
  77. data/man/man8/puppet-resource.8 +1 -1
  78. data/man/man8/puppet-script.8 +1 -1
  79. data/man/man8/puppet-ssl.8 +1 -1
  80. data/man/man8/puppet-status.8 +2 -2
  81. data/man/man8/puppet.8 +2 -2
  82. data/spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages +30 -0
  83. data/spec/integration/application/agent_spec.rb +23 -19
  84. data/spec/integration/application/filebucket_spec.rb +7 -7
  85. data/spec/integration/application/plugin_spec.rb +3 -3
  86. data/spec/integration/configurer_spec.rb +14 -0
  87. data/spec/integration/defaults_spec.rb +26 -1
  88. data/spec/integration/util/windows/adsi_spec.rb +2 -2
  89. data/spec/shared_contexts/types_setup.rb +2 -0
  90. data/spec/unit/application/doc_spec.rb +2 -2
  91. data/spec/unit/application/facts_spec.rb +3 -1
  92. data/spec/unit/application_spec.rb +9 -4
  93. data/spec/unit/configurer_spec.rb +39 -6
  94. data/spec/unit/environments_spec.rb +99 -32
  95. data/spec/unit/face/config_spec.rb +56 -0
  96. data/spec/unit/face/node_spec.rb +2 -2
  97. data/spec/unit/file_system_spec.rb +1 -2
  98. data/spec/unit/http/resolver_spec.rb +24 -4
  99. data/spec/unit/http/service/ca_spec.rb +2 -2
  100. data/spec/unit/http/service/compiler_spec.rb +2 -2
  101. data/spec/unit/http/service/file_server_spec.rb +2 -2
  102. data/spec/unit/http/service/puppetserver_spec.rb +82 -0
  103. data/spec/unit/http/service/report_spec.rb +2 -2
  104. data/spec/unit/http/session_spec.rb +8 -20
  105. data/spec/unit/indirector/catalog/json_spec.rb +1 -1
  106. data/spec/unit/indirector/catalog/rest_spec.rb +1 -1
  107. data/spec/unit/indirector/facts/rest_spec.rb +1 -1
  108. data/spec/unit/indirector/json_spec.rb +8 -8
  109. data/spec/unit/indirector/msgpack_spec.rb +8 -8
  110. data/spec/unit/indirector/node/rest_spec.rb +1 -1
  111. data/spec/unit/indirector/request_spec.rb +4 -4
  112. data/spec/unit/indirector/rest_spec.rb +1 -1
  113. data/spec/unit/indirector/status/rest_spec.rb +1 -1
  114. data/spec/unit/indirector/yaml_spec.rb +7 -7
  115. data/spec/unit/network/http/api/master/v3/environments_spec.rb +12 -23
  116. data/spec/unit/provider/exec_spec.rb +4 -3
  117. data/spec/unit/provider/package/dpkg_spec.rb +22 -7
  118. data/spec/unit/provider/package/openbsd_spec.rb +2 -0
  119. data/spec/unit/provider/package/pip2_spec.rb +36 -0
  120. data/spec/unit/provider/package/puppetserver_gem_spec.rb +137 -0
  121. data/spec/unit/provider/package/yum_spec.rb +31 -0
  122. data/spec/unit/provider/service/base_spec.rb +2 -4
  123. data/spec/unit/provider/service/bsd_spec.rb +5 -1
  124. data/spec/unit/provider/service/daemontools_spec.rb +1 -1
  125. data/spec/unit/provider/service/debian_spec.rb +3 -5
  126. data/spec/unit/provider/service/freebsd_spec.rb +1 -1
  127. data/spec/unit/provider/service/gentoo_spec.rb +4 -5
  128. data/spec/unit/provider/service/init_spec.rb +4 -5
  129. data/spec/unit/provider/service/launchd_spec.rb +5 -6
  130. data/spec/unit/provider/service/openrc_spec.rb +4 -5
  131. data/spec/unit/provider/service/openwrt_spec.rb +1 -1
  132. data/spec/unit/provider/service/redhat_spec.rb +1 -1
  133. data/spec/unit/provider/service/runit_spec.rb +2 -1
  134. data/spec/unit/provider/service/smf_spec.rb +1 -1
  135. data/spec/unit/provider/service/src_spec.rb +3 -5
  136. data/spec/unit/provider/service/systemd_spec.rb +3 -1
  137. data/spec/unit/provider/service/upstart_spec.rb +4 -5
  138. data/spec/unit/rest/route_spec.rb +4 -4
  139. data/spec/unit/settings_spec.rb +44 -22
  140. data/spec/unit/transaction/report_spec.rb +2 -0
  141. data/spec/unit/type/file/source_spec.rb +1 -1
  142. data/spec/unit/type/filebucket_spec.rb +1 -1
  143. data/spec/unit/util/run_mode_spec.rb +6 -6
  144. metadata +13 -2
data/spec/unit/transaction/report_spec.rb CHANGED
@@ -676,6 +676,7 @@ Version:
676
676
  report.catalog_uuid = "some catalog uuid"
677
677
  report.cached_catalog_status = "not_used"
678
678
  report.master_used = "test:000"
679
+ report.server_used = "test:000"
679
680
  report.add_resource_status(status)
680
681
  report.transaction_completed = true
681
682
  report.finalize_report
@@ -694,6 +695,7 @@ Version:
694
695
  report.catalog_uuid = "some catalog uuid"
695
696
  report.cached_catalog_status = "not_used"
696
697
  report.master_used = "test:000"
698
+ report.server_used = "test:000"
697
699
  report.add_resource_status(status)
698
700
  report.transaction_completed = true
699
701
  report.finalize_report
data/spec/unit/type/file/source_spec.rb CHANGED
@@ -521,7 +521,7 @@ describe Puppet::Type.type(:file).attrclass(:source), :uses_checksums => true do
521
521
  end
522
522
 
523
523
  it "should return the default source port" do
524
- Puppet[:masterport] = 1234
524
+ Puppet[:serverport] = 1234
525
525
  expect(resource.parameter(:source).port).to eq(1234)
526
526
  end
527
527
  end
data/spec/unit/type/filebucket_spec.rb CHANGED
@@ -21,7 +21,7 @@ describe Puppet::Type.type(:filebucket) do
21
21
  end
22
22
 
23
23
  it "should not have a default port" do
24
- Puppet.settings[:masterport] = 50
24
+ Puppet.settings[:serverport] = 50
25
25
  expect(Puppet::Type.type(:filebucket).new(:name => "main")[:port]).to eq(nil)
26
26
  end
27
27
 
data/spec/unit/util/run_mode_spec.rb CHANGED
@@ -25,12 +25,12 @@ describe Puppet::Util::RunMode do
25
25
  as_non_root { expect(@run_mode.conf_dir).to eq(File.expand_path('~/.puppetlabs/etc/puppet')) }
26
26
  end
27
27
 
28
- context "master run mode" do
28
+ context "server run mode" do
29
29
  before do
30
- @run_mode = Puppet::Util::UnixRunMode.new('master')
30
+ @run_mode = Puppet::Util::UnixRunMode.new('server')
31
31
  end
32
32
 
33
- it "has confdir ~/.puppetlabs/etc/puppet when run as non-root and master run mode" do
33
+ it "has confdir ~/.puppetlabs/etc/puppet when run as non-root and server run mode" do
34
34
  as_non_root { expect(@run_mode.conf_dir).to eq(File.expand_path('~/.puppetlabs/etc/puppet')) }
35
35
  end
36
36
  end
@@ -53,12 +53,12 @@ describe Puppet::Util::RunMode do
53
53
  as_non_root { expect(@run_mode.code_dir).to eq(File.expand_path('~/.puppetlabs/etc/code')) }
54
54
  end
55
55
 
56
- context "master run mode" do
56
+ context "server run mode" do
57
57
  before do
58
- @run_mode = Puppet::Util::UnixRunMode.new('master')
58
+ @run_mode = Puppet::Util::UnixRunMode.new('server')
59
59
  end
60
60
 
61
- it "has codedir ~/.puppetlabs/etc/code when run as non-root and master run mode" do
61
+ it "has codedir ~/.puppetlabs/etc/code when run as non-root and server run mode" do
62
62
  as_non_root { expect(@run_mode.code_dir).to eq(File.expand_path('~/.puppetlabs/etc/code')) }
63
63
  end
64
64
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.18.0
4
+ version: 6.19.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppet Labs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-24 00:00:00.000000000 Z
11
+ date: 2020-10-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: facter
@@ -573,6 +573,7 @@ files:
573
573
  - lib/puppet/http/service/ca.rb
574
574
  - lib/puppet/http/service/compiler.rb
575
575
  - lib/puppet/http/service/file_server.rb
576
+ - lib/puppet/http/service/puppetserver.rb
576
577
  - lib/puppet/http/service/report.rb
577
578
  - lib/puppet/http/session.rb
578
579
  - lib/puppet/indirector.rb
@@ -1053,6 +1054,7 @@ files:
1053
1054
  - lib/puppet/provider/package/opkg.rb
1054
1055
  - lib/puppet/provider/package/pacman.rb
1055
1056
  - lib/puppet/provider/package/pip.rb
1057
+ - lib/puppet/provider/package/pip2.rb
1056
1058
  - lib/puppet/provider/package/pip3.rb
1057
1059
  - lib/puppet/provider/package/pkg.rb
1058
1060
  - lib/puppet/provider/package/pkgdmg.rb
@@ -1063,6 +1065,7 @@ files:
1063
1065
  - lib/puppet/provider/package/ports.rb
1064
1066
  - lib/puppet/provider/package/portupgrade.rb
1065
1067
  - lib/puppet/provider/package/puppet_gem.rb
1068
+ - lib/puppet/provider/package/puppetserver_gem.rb
1066
1069
  - lib/puppet/provider/package/rpm.rb
1067
1070
  - lib/puppet/provider/package/rug.rb
1068
1071
  - lib/puppet/provider/package/sun.rb
@@ -1750,6 +1753,7 @@ files:
1750
1753
  - spec/fixtures/unit/provider/package/pkgng/pkg.query
1751
1754
  - spec/fixtures/unit/provider/package/pkgng/pkg.query.zsh
1752
1755
  - spec/fixtures/unit/provider/package/pkgng/pkg.version
1756
+ - spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages
1753
1757
  - spec/fixtures/unit/provider/package/sun/dummy.server
1754
1758
  - spec/fixtures/unit/provider/package/sun/simple
1755
1759
  - spec/fixtures/unit/provider/package/yum/yum-check-update-broken-notices.txt
@@ -2099,6 +2103,7 @@ files:
2099
2103
  - spec/unit/http/service/ca_spec.rb
2100
2104
  - spec/unit/http/service/compiler_spec.rb
2101
2105
  - spec/unit/http/service/file_server_spec.rb
2106
+ - spec/unit/http/service/puppetserver_spec.rb
2102
2107
  - spec/unit/http/service/report_spec.rb
2103
2108
  - spec/unit/http/service_spec.rb
2104
2109
  - spec/unit/http/session_spec.rb
@@ -2401,6 +2406,7 @@ files:
2401
2406
  - spec/unit/provider/package/openbsd_spec.rb
2402
2407
  - spec/unit/provider/package/opkg_spec.rb
2403
2408
  - spec/unit/provider/package/pacman_spec.rb
2409
+ - spec/unit/provider/package/pip2_spec.rb
2404
2410
  - spec/unit/provider/package/pip3_spec.rb
2405
2411
  - spec/unit/provider/package/pip_spec.rb
2406
2412
  - spec/unit/provider/package/pkg_spec.rb
@@ -2410,6 +2416,7 @@ files:
2410
2416
  - spec/unit/provider/package/pkgutil_spec.rb
2411
2417
  - spec/unit/provider/package/portage_spec.rb
2412
2418
  - spec/unit/provider/package/puppet_gem_spec.rb
2419
+ - spec/unit/provider/package/puppetserver_gem_spec.rb
2413
2420
  - spec/unit/provider/package/rpm_spec.rb
2414
2421
  - spec/unit/provider/package/sun_spec.rb
2415
2422
  - spec/unit/provider/package/tdnf_spec.rb
@@ -3015,6 +3022,7 @@ test_files:
3015
3022
  - spec/fixtures/unit/provider/package/pkgng/pkg.query
3016
3023
  - spec/fixtures/unit/provider/package/pkgng/pkg.query.zsh
3017
3024
  - spec/fixtures/unit/provider/package/pkgng/pkg.version
3025
+ - spec/fixtures/unit/provider/package/puppetserver_gem/gem-list-local-packages
3018
3026
  - spec/fixtures/unit/provider/package/sun/dummy.server
3019
3027
  - spec/fixtures/unit/provider/package/sun/simple
3020
3028
  - spec/fixtures/unit/provider/package/yum/yum-check-update-broken-notices.txt
@@ -3364,6 +3372,7 @@ test_files:
3364
3372
  - spec/unit/http/service/ca_spec.rb
3365
3373
  - spec/unit/http/service/compiler_spec.rb
3366
3374
  - spec/unit/http/service/file_server_spec.rb
3375
+ - spec/unit/http/service/puppetserver_spec.rb
3367
3376
  - spec/unit/http/service/report_spec.rb
3368
3377
  - spec/unit/http/service_spec.rb
3369
3378
  - spec/unit/http/session_spec.rb
@@ -3666,6 +3675,7 @@ test_files:
3666
3675
  - spec/unit/provider/package/openbsd_spec.rb
3667
3676
  - spec/unit/provider/package/opkg_spec.rb
3668
3677
  - spec/unit/provider/package/pacman_spec.rb
3678
+ - spec/unit/provider/package/pip2_spec.rb
3669
3679
  - spec/unit/provider/package/pip3_spec.rb
3670
3680
  - spec/unit/provider/package/pip_spec.rb
3671
3681
  - spec/unit/provider/package/pkg_spec.rb
@@ -3675,6 +3685,7 @@ test_files:
3675
3685
  - spec/unit/provider/package/pkgutil_spec.rb
3676
3686
  - spec/unit/provider/package/portage_spec.rb
3677
3687
  - spec/unit/provider/package/puppet_gem_spec.rb
3688
+ - spec/unit/provider/package/puppetserver_gem_spec.rb
3678
3689
  - spec/unit/provider/package/rpm_spec.rb
3679
3690
  - spec/unit/provider/package/sun_spec.rb
3680
3691
  - spec/unit/provider/package/tdnf_spec.rb