Merge branch 'production' into feature/expanded_custom_facts

.fixtures.yml

@@ -5,7 +5,7 @@ fixtures:
       ref:  "1.4.1"
     concat:
       repo: "puppetlabs/concat"
-      ref:  "1.2.0"
+      ref:  "1.2.2"
     stdlib:
       repo: "puppetlabs/stdlib"
       ref:  "4.6.0"

.travis.yml

@@ -6,24 +6,23 @@ script: bundle exec rake test
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 2.1" HIERA_GEM_VERSION="~> 1.3"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 2.2" HIERA_GEM_VERSION="~> 1.3"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 2.1" HIERA_GEM_VERSION="~> 1.3"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 2.2" HIERA_GEM_VERSION="~> 1.3"
   - rvm: 2.1.7
-    env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 2.1" HIERA_GEM_VERSION="~> 1.3"
-  - rvm: 2.1.7
-    env: PUPPET_GEM_VERSION="3.8.5" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 1.3" FUTURE_PARSER="yes"
+    env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 2.2" HIERA_GEM_VERSION="~> 1.3"
   - rvm: 2.1.7
-    env: PUPPET_GEM_VERSION="4.3.2" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.0"
-notifications:
-  slack:
-    secure: EwJDWYpcaMh5Ebb4EbsVu+nc1QPff/OTT0aYyExl5i7e8YFKUAL6oTNtupo3s/RO1CUBUOcKGvYUmbhuTxo1o/MfKNFviR8xaYNS2sktZ0961jpd5JtLYxaZd91JKLb2ZrMuAckejM17+lMxivu8+PKZnuF7S78DHNLDLVJkBrY=
-  email: false
+    env: PUPPET_GEM_VERSION="~> 3.8.5" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 1.3" FUTURE_PARSER="yes"
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.5.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.2.0"
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.7.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.2.0"
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.8.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.2.0"
+  - rvm: 2.1.9
+    env: PUPPET_GEM_VERSION="~> 4.9.0" FACTER_GEM_VERSION="~> 2.4" HIERA_GEM_VERSION="~> 3.3.0"
+
 deploy:
   provider: puppetforge
   user: abstractit

CHANGELOG.md

@@ -1,3 +1,31 @@
+##2016-10-10 - Pete Brown <pete@abstractit.com.au> 2.3.0-alpha
+###Summary
+Numerous bugfixes.
+Feature: Configure agents using SRV records @aaron-miller
+Feature: Added parameter manage_dbserver to profiles/master @chrisowensboston
+
+####Bugfixes
+Fix puppet group in puppet 4 @seanscottking
+Update Puppetlabs apt keys @rdvh
+Fix puppetserver should connect to non SSL puppetdb via http not https @divansantana
+Update metadata.json to allow use of zack-r10k version 3.2.0 @rpkish
+Define relationship between sysconfig and service in agent @toepi
+Deploy puppetdb ssl certs when ssl is enabled @divansantana
+Fix r10k manage_ruby_dependency error @divansantana
+Fix could not find init script in some cases @divansantana
+Support for strict_variables mode @tequeter
+define relationship between vhost an package puppetmaster-passenger @toepi
+distinguish between Debian and Ubuntu for puppetmaster-passenger setup @toepi
+Add support for splay and splaylimit parameters in puppet.conf @paulseward
+Fix syntax error on readme @jordigg
+in manifests/repo.pp added include ::puppet, to fix unknown variable puppet::manage_repos @chrisowensboston
+in manifests/init.pp added "+ 0" after calls to fqdn_rand, to force conversion to integer. @chrisowensboston
+in spec/classes/puppet_agent_spec.rb, Changed tests for interpolated minute values to accommodate different versions of fqdn_rand using different entropy sources. Changed host name from "testy" to "testy2" because "testy" happened to give a 0 using fqdn_rand(14)
+In .fixtures.yml, changed puppetlabs/concat version requirement from '1.2.0' to '>= 1.2.2 < 2.0.0', to fix "uknown variable ::is_pe" bug @chrisowensboston
+in Gemfile, forced json_pure to be < 2.0.1 when ruby < 2.0 @chrisowensboston
+in .travis.yml, added a line for rvm 2.2.0, puppet gem 4.7.0, facter gem 2.4.6, hiera gem 3.2.1 @chrisowensboston
+
+
 ##2016-02-11 - Pete Brown <pete@abstractit.com.au> 2.2.1
 ###Summary
 

Gemfile

@@ -11,19 +11,17 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem "rspec-core",             '3.5.1',                  :require => false
-  gem "rspec-puppet",           '2.4.0',                  :require => false
-  gem 'puppetlabs_spec_helper', '1.1.1',                  :require => false
-  gem 'rspec-puppet-facts',     '1.3.0',                  :require => false
-  gem "puppet-syntax",                                    :require => false
+  gem "rspec-core",             '3.5.4',                  :require => false
+  gem "rspec-puppet",           '2.5.0',                  :require => false
+  gem 'puppetlabs_spec_helper', '2.1.0',                  :require => false
+  gem 'rspec-puppet-facts',     '1.7.1',                  :require => false
+  gem "puppet-syntax",          '2.1.0',                  :require => false
   gem 'metadata-json-lint',                               :require => false
   gem 'simplecov',                                        :require => false
-  gem 'json',                   '1.8.3',                  :require => false
-  gem 'json_pure',              '1.8.3',                  :require => false
-  gem 'rubocop',                '0.41.2',                 :require => false
+  gem 'json',                   '1.8.5',                  :require => false
   gem "puppet-blacksmith",                                :require => false
   gem 'pry',                    '<= 0.9.8',               :require => false
-  gem 'puppet-lint',                                      :require => false
+  gem 'puppet-lint',            '2.0.2',                  :require => false
   gem 'puppet-lint-unquoted_string-check',                :require => false
   gem 'puppet-lint-empty_string-check',                   :require => false
   gem 'puppet-lint-leading_zero-check',                   :require => false
@@ -56,6 +54,10 @@ end
 #   gem 'beaker-puppet_install_helper', :require => false
 # end
 
+# puppet requires json_pure; json_pure > 2.0.1 requires Ruby 2
+# so force the older json_pure in the case of older ruby
+gem 'json_pure', '< 2.0.2', :require => false, :platforms => [:ruby_18, :ruby_19]
+
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
 else

Gemfile.lock

@@ -1,51 +1,62 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
     addressable (2.4.0)
-    ast (2.3.0)
     backports (3.6.8)
     coderay (1.0.9)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    domain_name (0.5.20160615)
+    domain_name (0.5.20170223)
       unf (>= 0.0.5, < 1.0.0)
-    ethon (0.9.0)
+    ethon (0.10.1)
       ffi (>= 1.3.0)
     facter (2.4.6)
-      CFPropertyList (~> 2.2.6)
-    facterdb (0.3.6)
+    facterdb (0.3.10)
       facter
       jgrep
-    faraday (0.9.2)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.14)
-    gh (0.14.0)
-      addressable
+    faraday_middleware (0.11.0.1)
+      faraday (>= 0.7.4, < 1.0)
+    fast_gettext (1.1.0)
+    ffi (1.9.18)
+    gettext (3.2.2)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gettext-setup (0.18)
+      fast_gettext (~> 1.1.0)
+      gettext (>= 3.0.2)
+      locale
+    gh (0.15.1)
+      addressable (~> 2.4.0)
       backports
       faraday (~> 0.8)
       multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
+      net-http-persistent (~> 2.9)
       net-http-pipeline
-    hiera (3.2.1)
+    hiera (3.2.2)
     highline (1.7.8)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
     jgrep (1.4.1)
       json
-    json (1.8.3)
-    json_pure (1.8.3)
+    json (1.8.5)
+    json_pure (1.8.6)
     launchy (2.4.3)
       addressable (~> 2.3)
+    locale (2.1.2)
+    mcollective-client (2.10.2)
+      json
+      stomp
+      systemu
     metaclass (0.0.4)
-    metadata-json-lint (0.0.11)
+    metadata-json-lint (1.1.0)
       json
+      semantic_puppet (>= 0.1.2, < 2.0.0)
       spdx-licenses (~> 1.0)
     method_source (0.8.2)
-    mime-types (2.99.2)
-    mocha (1.1.0)
+    mime-types (2.99.3)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
@@ -59,44 +70,41 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7)
       slop (>= 2.4.3, < 3)
-    puppet (4.3.2)
-      CFPropertyList (~> 2.2.6)
+    puppet (4.7.0)
       facter (> 2.0, < 4)
       hiera (>= 2.0, < 4)
       json_pure (~> 1.8)
     puppet-blacksmith (3.4.0)
       puppet (>= 2.7.16)
       rest-client (~> 1.8.0)
-    puppet-lint (1.1.0)
+    puppet-lint (2.0.2)
     puppet-lint-absolute_classname-check (0.2.4)
       puppet-lint (>= 1.0, < 3.0)
     puppet-lint-empty_string-check (0.2.2)
       puppet-lint (>= 1.0, < 3.0)
     puppet-lint-leading_zero-check (0.1.1)
       puppet-lint (>= 1.0, < 3.0)
-    puppet-lint-roles_and_profiles-check (0.1.0)
-      puppet-lint (~> 1.0)
+    puppet-lint-roles_and_profiles-check (0.1.1)
+      puppet-lint (>= 1.0, < 3.0)
     puppet-lint-spaceship_operator_without_tag-check (0.1.1)
       puppet-lint (>= 1.0, < 3.0)
     puppet-lint-undef_in_function-check (0.2.1)
       puppet-lint (>= 1.0, < 3.0)
     puppet-lint-unquoted_string-check (0.3.0)
       puppet-lint (>= 1.0, < 3.0)
-    puppet-lint-variable_contains_upcase (1.0.1)
+    puppet-lint-variable_contains_upcase (1.2.0)
       puppet-lint (>= 1.0, < 3.0)
     puppet-syntax (2.1.0)
       rake
-    puppetlabs_spec_helper (1.1.1)
-      mocha
-      puppet-lint
-      puppet-syntax
-      rake
-      rspec-puppet
+    puppetlabs_spec_helper (2.1.0)
+      mocha (~> 1.0)
+      puppet-lint (~> 2.0)
+      puppet-syntax (~> 2.0)
+      rspec-puppet (~> 2.0)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rainbow (2.1.0)
-    rake (11.2.2)
+    rake (12.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -105,37 +113,36 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.1)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
-    rspec-puppet (2.4.0)
+    rspec-puppet (2.5.0)
       rspec
-    rspec-puppet-facts (1.3.0)
+    rspec-puppet-facts (1.7.1)
       facter
       facterdb (>= 0.3.0)
       json
+      mcollective-client
       puppet
     rspec-support (3.5.0)
-    rubocop (0.41.2)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    simplecov (0.12.0)
+    semantic_puppet (0.1.4)
+      gettext-setup (>= 0.3)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (2.4.4)
     spdx-licenses (1.1.0)
-    travis (1.8.2)
+    stomp (1.4.3)
+    systemu (2.6.5)
+    text (1.3.1)
+    travis (1.8.8)
       backports
       faraday (~> 0.9)
       faraday_middleware (~> 0.9, >= 0.9.1)
@@ -151,22 +158,21 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.1.0)
-    websocket (1.2.3)
+    websocket (1.2.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   facter
   hiera
-  json (= 1.8.3)
-  json_pure (= 1.8.3)
+  json (= 1.8.5)
+  json_pure (< 2.0.2)
   metadata-json-lint
   pry (<= 0.9.8)
   puppet
   puppet-blacksmith
-  puppet-lint
+  puppet-lint (= 2.0.2)
   puppet-lint-absolute_classname-check
   puppet-lint-empty_string-check
   puppet-lint-leading_zero-check
@@ -175,15 +181,14 @@ DEPENDENCIES
   puppet-lint-undef_in_function-check
   puppet-lint-unquoted_string-check
   puppet-lint-variable_contains_upcase
-  puppet-syntax
-  puppetlabs_spec_helper (= 1.1.1)
-  rspec-core (= 3.5.1)
-  rspec-puppet (= 2.4.0)
-  rspec-puppet-facts (= 1.3.0)
-  rubocop (= 0.41.2)
+  puppet-syntax (= 2.1.0)
+  puppetlabs_spec_helper (= 2.1.0)
+  rspec-core (= 3.5.4)
+  rspec-puppet (= 2.5.0)
+  rspec-puppet-facts (= 1.7.1)
   simplecov
   travis
   travis-lint
 
 BUNDLED WITH
-   1.11.2
+   1.14.6

Rakefile

@@ -16,7 +16,6 @@ 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.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
 
 exclude_paths = [
   "pkg/**/*",
@@ -77,4 +76,4 @@ if RUBY_VERSION >= "2.1.0" then
       fail "Unable to find a CHANGELOG.md entry for the #{v} release."
     end
   end
-end
+end

manifests/defaults.pp

@@ -43,6 +43,7 @@
     $puppetdb_etcdir           = '/etc/puppetlabs/puppetdb'
     $puppetdb_test_url         = '/pdb/meta/v1/version'
     $gem_provider              = 'puppetserver_gem'
+    $puppet_group              = 'root'
   } else {
     $server_type               = 'passenger'
     $confdir                   = '/etc/puppet'
@@ -59,6 +60,7 @@
     $puppetdb_etcdir           = '/etc/puppetdb'
     $puppetdb_test_url         = '/v3/version'
     $gem_provider              = 'gem'
+    $puppet_group              = 'puppet'
   }
   $puppetdb_confdir          = "${puppetdb_etcdir}/conf.d"
   $puppetdb_ssl_dir          = "${puppetdb_etcdir}/ssl"