Fixes #9466 - gutterball.conf missing gutterball.amqp.connect

librarian-puppet update katello-katello katello-gutterball

Puppetfile.lock

@@ -7,11 +7,11 @@ FORGE
       puppetlabs-stdlib (>= 2.4.0)
     puppetlabs-apt (1.7.0)
       puppetlabs-stdlib (>= 2.2.1)
-    puppetlabs-concat (1.1.2)
+    puppetlabs-concat (1.2.0)
       puppetlabs-stdlib (< 5.0.0, >= 3.2.0)
     puppetlabs-stdlib (4.5.1)
     puppetlabs-vcsrepo (1.2.0)
-    puppetlabs-xinetd (1.4.0)
+    puppetlabs-xinetd (1.5.0)
       puppetlabs-stdlib (>= 2.2.1)
 
 GIT
@@ -43,7 +43,7 @@ GIT
 GIT
   remote: https://github.com/Katello/puppet-certs
   ref: master
-  sha: 6952cc23212f2122d6bf2860bf5daa8cc4da5a14
+  sha: f23512f0cb57fb158be4f8fa16ef1e20a579bffe
   specs:
     katello-certs (0.1.0)
       katello-common (>= 0.0.1)
@@ -78,7 +78,7 @@ GIT
 GIT
   remote: https://github.com/Katello/puppet-gutterball
   ref: master
-  sha: 34c9ad7a26443c7df65e0de7f68203c03c45cf8b
+  sha: f2663ea0bee635dae3391997434a7cfca31532f7
   specs:
     katello-gutterball (0.1.0)
       puppetlabs-concat (>= 1.1.1)
@@ -90,7 +90,7 @@ GIT
 GIT
   remote: https://github.com/Katello/puppet-katello
   ref: master
-  sha: fa0be36e78381cb1ec8406509a51f1428ba3ab85
+  sha: 7b70306ef2bae1fe654cf52c1961b6ad4b16ae47
   specs:
     katello-katello (0.1.0)
       katello-candlepin (>= 0.1.0)
@@ -134,7 +134,7 @@ GIT
 GIT
   remote: https://github.com/Katello/puppet-pulp
   ref: master
-  sha: d9f53d1c7be53beb12a211505d2ae3b89f5a5d4f
+  sha: c16eb78d6f99460765d62eb8428f1606dd793768
   specs:
     katello-pulp (0.1.0)
       katello-qpid (>= 0.1.0)
@@ -147,7 +147,7 @@ GIT
 GIT
   remote: https://github.com/Katello/puppet-qpid
   ref: master
-  sha: 9f0e76c37ab5c3811f86cc893dbce5b4e7f4612f
+  sha: c360fc8bdbab61127c8349641fc23455e62c7216
   specs:
     katello-qpid (1.0.0)
       puppetlabs-stdlib (>= 3.0.0)
@@ -171,7 +171,7 @@ GIT
 GIT
   remote: https://github.com/puppetlabs/puppetlabs-mongodb
   ref: master
-  sha: cb8db6aafa7c55729adb7b35db02315f784ff2ec
+  sha: 4f5ca99fcba4339a8093d2cb329f5498866a8c8c
   specs:
     puppetlabs-mongodb (0.10.0)
       puppetlabs-apt (< 2.0.0, >= 1.0.0)
@@ -198,7 +198,7 @@ GIT
 GIT
   remote: https://github.com/theforeman/puppet-concat
   ref: master
-  sha: 8a75f42f051e6ca81b40921dfdb5b54543bf0e8f
+  sha: 1511b30c42336c8a6cdaf39989953be833d3ac30
   specs:
     theforeman-concat_native (1.3.3)
 
@@ -267,7 +267,7 @@ GIT
 GIT
   remote: https://github.com/theforeman/puppet-tftp
   ref: master
-  sha: 396bd6aff78fc092a99259df444899569bc4e4c7
+  sha: 6706dafcb70c2e1403a1b1700578ef3f9dad6726
   specs:
     theforeman-tftp (1.5.1)
       puppetlabs-stdlib (< 5.0.0, >= 2.3.0)

modules/certs/manifests/foreman.pp

@@ -48,7 +48,7 @@
       mode   => '0400',
     }
 
-    $foreman_config_cmd = "${::foreman::app_root}/script/foreman-config\
+    $foreman_config_cmd = "${::foreman::app_root}/script/foreman-rake config\
       -k ssl_ca_file -v '${ssl_ca_cert}'\
       -k ssl_certificate -v '${client_cert}'\
       -k ssl_priv_key -v '${client_key}'"

modules/concat/CHANGELOG.md

@@ -1,5 +1,19 @@
-##2014-10-28 - Supported Release 1.1.2
+##2015-02-17 - Supported Release 1.2.0
+###Summary
+
+This release includes a number of bugfixes and adds support for running a validation command when using puppet >= 3.5.0.
+
+####Features
+- Support running a validation command for Puppet >= 3.5.0
+
+####Bugfixes
+- Reset poisoned defaults from Exec
+- Use concatfragments.rb on AIX since it doesn't support print0
+- Make sure ruby is in the path for PE (MODULES-1456)
+- Fix missing method for check_is_owned_by for windows (MODULES-1764)
+- Fix sort by numeric
 
+##2014-10-28 - Supported Release 1.1.2
 ###Summary
 
 This release includes bugfixes and test improvements. The module was tested against SLES10 and SLES12 and found to work against those platforms with no module improvements. Metadata was updated to include those as supported platforms.
@@ -12,7 +26,6 @@ This release includes bugfixes and test improvements. The module was tested agai
 - Fix typo in CHANGELOG.md
 
 ##2014-09-10 - Supported Release 1.1.1
-
 ###Summary
 
 This is a bugfix release, and the first supported release of the 1.1.x series.
@@ -32,7 +45,6 @@ This is a bugfix release, and the first supported release of the 1.1.x series.
 - Synchronized files for more consistency across modules via modulesync
 
 ##2014-05-14 - Release 1.1.0
-
 ###Summary
 
 This release is primarily a bugfix release since 1.1.0-rc1.
@@ -47,7 +59,6 @@ This release is primarily a bugfix release since 1.1.0-rc1.
 - Fix newlines
 
 ##2014-01-03 - Release 1.1.0-rc1
-
 ###Summary
 
 This release of concat was 90% written by Joshua Hoblitt, and the module team
@@ -137,7 +148,6 @@ This is a supported release. No functional changes were made from 1.0.1.
 
 
 ##2014-02-12 - 1.0.1
-
 ###Summary
 
 Minor bugfixes for sorting of fragments and ordering of resources.
@@ -150,7 +160,6 @@ fragments.
 
 
 ##2013-08-09 - 1.0.0
-
 ###Summary
 
 Many new features and bugfixes in this release, and if you're a heavy concat

modules/concat/CONTRIBUTING.md

@@ -41,11 +41,9 @@ Checklist (and a short version for the impatient)
 
     * Pre-requisites:
 
-      - Sign the [Contributor License Agreement](https://cla.puppetlabs.com/)
-
       - Make sure you have a [GitHub account](https://github.com/join)
 
-      - [Create a ticket](http://projects.puppetlabs.com/projects/modules/issues/new), or [watch the ticket](http://projects.puppetlabs.com/projects/modules/issues) you are patching for.
+      - [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
 
     * Preferred method:
 
@@ -94,17 +92,7 @@ The long version
       whitespace or other "whitespace errors".  You can do this by
       running "git diff --check" on your changes before you commit.
 
-  2.  Sign the Contributor License Agreement
-
-      Before we can accept your changes, we do need a signed Puppet
-      Labs Contributor License Agreement (CLA).
-
-      You can access the CLA via the [Contributor License Agreement link](https://cla.puppetlabs.com/)
-
-      If you have any questions about the CLA, please feel free to
-      contact Puppet Labs via email at cla-submissions@puppetlabs.com.
-
-  3.  Sending your patches
+  2.  Sending your patches
 
       To submit your changes via a GitHub pull request, we _highly_
       recommend that you have them on a topic branch, instead of
@@ -124,7 +112,7 @@ The long version
       in order to open a pull request.
 
 
-  4.  Update the related GitHub issue.
+  3.  Update the related GitHub issue.
 
       If there is a GitHub issue associated with the change you
       submitted, then you should update the ticket to include the
@@ -220,14 +208,12 @@ review.
 Additional Resources
 ====================
 
-* [Getting additional help](http://projects.puppetlabs.com/projects/puppet/wiki/Getting_Help)
+* [Getting additional help](http://puppetlabs.com/community/get-help)
 
 * [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
 
 * [Patchwork](https://patchwork.puppetlabs.com)
 
-* [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign)
-
 * [General GitHub documentation](http://help.github.com/)
 
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

modules/concat/Gemfile

@@ -1,25 +1,44 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
-group :development, :test do
+def location_for(place, fake_version = nil)
+  if place =~ /^(git:[^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
+
+group :development, :unit_tests do
   gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
+  gem 'rspec-core', '3.1.7',     :require => false
+  gem 'rspec-puppet', '~> 1.0',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'serverspec',              :require => false
-  gem 'puppet-lint', '0.3.2',    :require => false
-  gem 'beaker',                  :require => false
-  gem 'beaker-rspec',            :require => false
-  gem 'pry',                     :require => false
+  gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false
+  gem 'puppet_facts',            :require => false
+  gem 'json',                    :require => false
+end
+
+beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
+group :system_tests do
+  if beaker_rspec_version
+    gem 'beaker-rspec', *location_for(beaker_rspec_version)
+  else  
+    gem 'beaker-rspec',  :require => false
+  end
+  gem 'serverspec',    :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
+  gem 'facter', *location_for(facterversion)
 else
   gem 'facter', :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
+  gem 'puppet', *location_for(puppetversion)
 else
   gem 'puppet', :require => false
 end

modules/concat/README.md

@@ -216,6 +216,14 @@ Ensure there's a newline at the end of the fragments.
 - ensure_newline => true
 - ensure_newline => false
 
+#####`validate_cmd`
+Ensure the destination file passes the following validation command.
+Only supported on Puppet >= 3.5.0.
+
+######Example
+- validate_cmd => '/usr/sbin/apache2 -t -f %'
+- validate_cmd => '/usr/sbin/visudo -c -f %'
+
 ####concat::fragment
 
 #####`target`

modules/concat/Rakefile

@@ -2,9 +2,9 @@ require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
 PuppetLint.configuration.fail_on_warnings
+PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]

modules/concat/checksums.json

@@ -1,26 +1,26 @@
 {
-  "CHANGELOG.md": "cdddbca7ff5fb3db018849ab04c902a5",
-  "CONTRIBUTING.md": "d911815dd7d0d90b90bb35382a6e3298",
-  "Gemfile": "7e54561091d91e1ce90e429ae4bcea19",
+  "CHANGELOG.md": "c39450c2a3ece201518069ca730de5f2",
+  "CONTRIBUTING.md": "e2b8e8e433fc76b3798b7fe435f49375",
+  "Gemfile": "8dc6d19e25876f331840cd73e847c0a8",
   "LICENSE": "f5a76685d453424cd63dde1535811cf0",
-  "README.md": "1a3d6bbaad03232055fdf7c7cf5a4e7f",
-  "Rakefile": "de8eeacfe1fbbc6a6f4d89adfc98bcaf",
-  "files/concatfragments.rb": "f88397daaf63a9c75bcf285b23b727ed",
+  "README.md": "2b4ea2e717e7e1834df02a67cc82e185",
+  "Rakefile": "9ae42c3a3ad6949efb2df1cd12ced1b6",
+  "files/concatfragments.rb": "b684db0eac243553a6a79365119a363d",
   "files/concatfragments.sh": "7bbe7c5fce25a5ddd20415d909ba44fc",
   "lib/facter/concat_basedir.rb": "ff080677e7f192b9b96911698b0b9b3d",
   "lib/puppet/parser/functions/concat_getparam.rb": "7654b44a87a05b2f2e9de2eaadf1ff8f",
   "lib/puppet/parser/functions/concat_is_bool.rb": "a5dc6980d7f27d1b858e791964682756",
   "manifests/fragment.pp": "85921c0e68ba60fc2e711c9324f03ff6",
-  "manifests/init.pp": "aa491fe7e5cba80dea09ead4c77bb02a",
-  "manifests/setup.pp": "dea1e9492771dabf32a1b2ac2161beb2",
-  "metadata.json": "5310ee163846a6b1688c595f9869d51a",
-  "spec/acceptance/backup_spec.rb": "6cd0023de71c7f297b919ad44875211c",
-  "spec/acceptance/concat_spec.rb": "7563f18be86799156ef40b982fb069a3",
-  "spec/acceptance/deprecation_warnings_spec.rb": "e178bbff7f4d75f441e97401d5043b48",
-  "spec/acceptance/empty_spec.rb": "8fbe5077e9d85c1ead153164fbf45cac",
-  "spec/acceptance/fragment_source_spec.rb": "d067b5a75a475df32b391031780c81fb",
-  "spec/acceptance/fragments_are_always_replaced_spec.rb": "1705de285eb045f26e92e85eadee7fe4",
-  "spec/acceptance/newline_spec.rb": "8e0b87458e5f6cc3ec242d22520e9fde",
+  "manifests/init.pp": "29dd84625571723bba5582fa8ecc83dc",
+  "manifests/setup.pp": "fae5d399610951c3c7a53a70f9c04ad7",
+  "metadata.json": "080e755dc2dab128e2cc87f76e10d8dd",
+  "spec/acceptance/backup_spec.rb": "1d60ad406485b47b42547f24a0b68dce",
+  "spec/acceptance/concat_spec.rb": "9faa3b9d57017adc24de2cd2c16960c3",
+  "spec/acceptance/deprecation_warnings_spec.rb": "c52721536ea53cd3e2a0aff897951e72",
+  "spec/acceptance/empty_spec.rb": "c787d7f36b3ba142f2592db3d1b59439",
+  "spec/acceptance/fragment_source_spec.rb": "594cef5172b52aa65dc16ebd34fad9c6",
+  "spec/acceptance/fragments_are_always_replaced_spec.rb": "be39ed9ed30e7bb48aaccda2d7f730ac",
+  "spec/acceptance/newline_spec.rb": "5aaf65972c4f8ed4fd1592cd863583f5",
   "spec/acceptance/nodesets/aix-71-vcloud.yml": "de6cc5bf18be2be8d50e62503652cb32",
   "spec/acceptance/nodesets/centos-59-x64.yml": "57eb3e471b9042a8ea40978c467f8151",
   "spec/acceptance/nodesets/centos-64-x64-pe.yml": "ec075d95760df3d4702abea1ce0a829b",
@@ -33,20 +33,22 @@
   "spec/acceptance/nodesets/fedora-18-x64.yml": "acc126fa764c39a3b1df36e9224a21d9",
   "spec/acceptance/nodesets/sles-11-x64.yml": "44e4c6c15c018333bfa9840a5e702f66",
   "spec/acceptance/nodesets/sles-11sp1-x64.yml": "fa0046bd89c1ab4ba9521ad79db234cd",
-  "spec/acceptance/nodesets/ubuntu-server-10044-x64.yml": "dc0da2d2449f66c8fdae16593811504f",
-  "spec/acceptance/nodesets/ubuntu-server-12042-x64.yml": "78a3ee42652e26119d90aa62586565b2",
+  "spec/acceptance/nodesets/ubuntu-server-10044-x64.yml": "75e86400b7889888dc0781c0ae1a1297",
+  "spec/acceptance/nodesets/ubuntu-server-12042-x64.yml": "d30d73e34cd50b043c7d14e305955269",
   "spec/acceptance/nodesets/ubuntu-server-1404-x64.yml": "5f0aed10098ac5b78e4217bb27c7aaf0",
-  "spec/acceptance/order_spec.rb": "bc2c9fc317bf3553e8eb817b00af6f00",
-  "spec/acceptance/quoted_paths_spec.rb": "b0996f7c377c0a16a64a62c3a8559c93",
-  "spec/acceptance/replace_spec.rb": "3cfadc1b7c812c96d99a43a69b27db40",
-  "spec/acceptance/symbolic_name_spec.rb": "94978d9d4742d18263c420c26e9d7a67",
-  "spec/acceptance/warn_spec.rb": "130c2c41cab442386ee8be4a1e1a6304",
+  "spec/acceptance/order_spec.rb": "76679ada1cd77b8b0663d0a65a4c7a25",
+  "spec/acceptance/quoted_paths_spec.rb": "a7810ac24a913bbc0d733f9b1d263748",
+  "spec/acceptance/replace_spec.rb": "48f4bb04e8f471cbaba0d9b53a8ab0f0",
+  "spec/acceptance/specinfra_stubs.rb": "27839261403d8bbccf506552f9d8ef38",
+  "spec/acceptance/symbolic_name_spec.rb": "b40452adbfebb0ea9d56547d9daee700",
+  "spec/acceptance/validation_spec.rb": "e54226b10f46cfa9e89e57398eddbbd2",
+  "spec/acceptance/warn_spec.rb": "cbf24bb8d9d5e9930e33632afb1d7647",
   "spec/spec.opts": "a600ded995d948e393fbe2320ba8e51c",
   "spec/spec_helper.rb": "0db89c9a486df193c0e40095422e19dc",
-  "spec/spec_helper_acceptance.rb": "64d9121df7bd9d2ce5163f0dc038f3a8",
-  "spec/unit/classes/concat_setup_spec.rb": "156863fa0a1449b9801be75bf7fc57d0",
-  "spec/unit/defines/concat_fragment_spec.rb": "70a174eeaab2c076707b5c381b7f6f8d",
-  "spec/unit/defines/concat_spec.rb": "ced5a5cfbdabf8ebaa7553c9e11deeda",
+  "spec/spec_helper_acceptance.rb": "41172ccedb75a916bd2f60658c42e1fb",
+  "spec/unit/classes/concat_setup_spec.rb": "fc1c95f8214e03b9de68b407a4e1fa1d",
+  "spec/unit/defines/concat_fragment_spec.rb": "6bcedce9f3388196f30ed3bee97b577b",
+  "spec/unit/defines/concat_spec.rb": "0a1965a07ba4373dd575e0141d8ed29c",
   "spec/unit/facts/concat_basedir_spec.rb": "cf00f5a07948436fa0a84d00fc098539",
   "tests/fragment.pp": "9adc3d9ba61676066072e1b949a37dbb",
   "tests/init.pp": "bd3ce7d2ee146744b5dbbaae8a927043"