puppet 4.10.5 → 4.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e3344150cb64ddf6fd3ccfa7da942b6b993abff
-  data.tar.gz: ed957f24eef19e4e9bbe540d444b12cd2d2a5e16
+  metadata.gz: 6d0d5aa5c14c06594698f3a7609d9cb7332829ce
+  data.tar.gz: 52a0b55f8d86625b8cb937b9ac0dd80cc7cb4732
 SHA512:
-  metadata.gz: 5d49f0c0f6a79566f905a2d98080bf65e6857629d78c3aba8a8219573e420f00c933e57126c052aea8257e03094e39264028b34862321e5b4fd080bcdf9e7981
-  data.tar.gz: caaf06d2b18158bbc63fd41ed54b22620dda2996f73c2af0ea20765050db58c5036c3f0e9edd870b28a4fe0a206685946665da12105b6b98dece6c738a921dd8
+  metadata.gz: 058cc6503ce3259385d53341697f24485bda285e442db9b199f78a338bc77a7e64d9d60bbd2ec4b288c5457fd972af17d48f54fb9a8155bb2aa94dfd05612827
+  data.tar.gz: d5e6cee1f38b22a96945575d898a8f2fedbc66c9c5775d67150723bebd6b8cebbeae274420f563da2c77e1f9bc9b256c327ab055d7d51ed6a60bf6d57e79b60c

data/lib/puppet/pops/lookup/lookup_adapter.rb

@@ -68,7 +68,8 @@ class LookupAdapter < DataAdapter
   end
 
   def lookup_global(key, lookup_invocation, merge_strategy)
-    terminus = Puppet[:data_binding_terminus]
+    # hiera_xxx will always use global_provider regardless of data_binding_terminus setting
+    terminus = lookup_invocation.hiera_xxx_call? ? :hiera : Puppet[:data_binding_terminus]
     case terminus
     when :hiera, 'hiera'
       provider = global_provider(lookup_invocation)

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '4.10.5'
+  PUPPETVERSION = '4.10.6'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/unit/functions/hiera_spec.rb

@@ -293,6 +293,11 @@ describe 'when calling' do
         expect(func('mod::c')).to eql('mod::c (from module)')
       end
     end
+
+    it 'should not be disabled by data_binding_terminus setting' do
+      Puppet[:data_binding_terminus] = 'none'
+      expect(func('a')).to eql('first a')
+    end
   end
 
   context 'hiera_array' do

metadata

@@ -1,101 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 4.10.5
+  version: 4.10.6
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '>'
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: hiera
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.10'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.10'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
 description: Puppet, an automated configuration management tool
@@ -112,154 +112,9 @@ files:
 - MAINTAINERS
 - README.md
 - Rakefile
+- install.rb
 - bin/extlookup2hiera
 - bin/puppet
-- conf/auth.conf
-- conf/environment.conf
-- conf/fileserver.conf
-- conf/puppet.conf
-- examples/hiera/README.md
-- examples/hiera/etc/hiera.yaml
-- examples/hiera/etc/hieradb/common.yaml
-- examples/hiera/etc/hieradb/dc1.yaml
-- examples/hiera/etc/hieradb/development.yaml
-- examples/hiera/etc/puppet.conf
-- examples/hiera/modules/data/manifests/common.pp
-- examples/hiera/modules/ntp/manifests/config.pp
-- examples/hiera/modules/ntp/manifests/data.pp
-- examples/hiera/modules/ntp/templates/ntp.conf.erb
-- examples/hiera/modules/users/manifests/common.pp
-- examples/hiera/modules/users/manifests/dc1.pp
-- examples/hiera/modules/users/manifests/development.pp
-- examples/hiera/site.pp
-- ext/README.environment
-- ext/autotest/Rakefile
-- ext/autotest/config
-- ext/autotest/readme.rst
-- ext/build_defaults.yaml
-- ext/cert_inspector
-- ext/dbfix.sql
-- ext/debian/README.Debian
-- ext/debian/README.source
-- ext/debian/TODO.Debian
-- ext/debian/changelog.erb
-- ext/debian/compat
-- ext/debian/control
-- ext/debian/copyright
-- ext/debian/docs
-- ext/debian/fileserver.conf
-- ext/debian/puppet-common.dirs
-- ext/debian/puppet-common.install
-- ext/debian/puppet-common.lintian-overrides
-- ext/debian/puppet-common.manpages
-- ext/debian/puppet-common.postinst
-- ext/debian/puppet-common.postrm
-- ext/debian/puppet-el.dirs
-- ext/debian/puppet-el.emacsen-install
-- ext/debian/puppet-el.emacsen-remove
-- ext/debian/puppet-el.emacsen-startup
-- ext/debian/puppet-el.install
-- ext/debian/puppet-testsuite.install
-- ext/debian/puppet-testsuite.lintian-overrides
-- ext/debian/puppet.default
-- ext/debian/puppet.init
-- ext/debian/puppet.lintian-overrides
-- ext/debian/puppet.logrotate
-- ext/debian/puppet.postinst
-- ext/debian/puppet.postrm
-- ext/debian/puppet.preinst
-- ext/debian/puppetmaster-common.install
-- ext/debian/puppetmaster-common.manpages
-- ext/debian/puppetmaster-common.postinst
-- ext/debian/puppetmaster-passenger.dirs
-- ext/debian/puppetmaster-passenger.postinst
-- ext/debian/puppetmaster-passenger.postrm
-- ext/debian/puppetmaster.README.debian
-- ext/debian/puppetmaster.default
-- ext/debian/puppetmaster.init
-- ext/debian/puppetmaster.lintian-overrides
-- ext/debian/puppetmaster.postinst
-- ext/debian/puppetmaster.postrm
-- ext/debian/puppetmaster.preinst
-- ext/debian/rules
-- ext/debian/source/format
-- ext/debian/source/options
-- ext/debian/vim-puppet.README.Debian
-- ext/debian/vim-puppet.dirs
-- ext/debian/vim-puppet.yaml
-- ext/debian/watch
-- ext/emacs/puppet-mode-init.el
-- ext/emacs/puppet-mode.el
-- ext/envpuppet
-- ext/envpuppet.bat
-- ext/freebsd/puppetd
-- ext/freebsd/puppetmasterd
-- ext/gentoo/conf.d/puppet
-- ext/gentoo/conf.d/puppetmaster
-- ext/gentoo/init.d/puppet
-- ext/gentoo/init.d/puppetmaster
-- ext/gentoo/puppet/fileserver.conf
-- ext/ips/puppet-agent
-- ext/ips/puppet-master
-- ext/ips/puppet.p5m.erb
-- ext/ips/puppetagent.xml
-- ext/ips/puppetmaster.xml
-- ext/ips/rules
-- ext/ips/transforms
-- ext/ldap/puppet.schema
-- ext/logcheck/puppet
-- ext/nagios/check_puppet.rb
-- ext/osx/file_mapping.yaml
-- ext/osx/postflight.erb
-- ext/osx/preflight.erb
-- ext/osx/prototype.plist.erb
-- ext/osx/puppet.plist
-- ext/project_data.yaml
-- ext/puppet-test
-- ext/pure_ruby_dsl/dsl_test.rb
-- ext/rack/config.ru
-- ext/rack/example-passenger-vhost.conf
-- ext/redhat/client.init
-- ext/redhat/client.sysconfig
-- ext/redhat/fileserver.conf
-- ext/redhat/logrotate
-- ext/redhat/puppet.spec.erb
-- ext/redhat/server.init
-- ext/redhat/server.sysconfig
-- ext/regexp_nodes/classes/databases
-- ext/regexp_nodes/classes/webservers
-- ext/regexp_nodes/environment/development
-- ext/regexp_nodes/parameters/service/prod
-- ext/regexp_nodes/parameters/service/qa
-- ext/regexp_nodes/parameters/service/sandbox
-- ext/regexp_nodes/regexp_nodes.rb
-- ext/solaris/pkginfo
-- ext/solaris/smf/puppet
-- ext/solaris/smf/puppet.xml
-- ext/solaris/smf/puppetd.xml
-- ext/solaris/smf/puppetmasterd.xml
-- ext/solaris/smf/svc-puppetd
-- ext/solaris/smf/svc-puppetmasterd
-- ext/suse/client.init
-- ext/suse/puppet.spec
-- ext/suse/server.init
-- ext/systemd/puppet.service
-- ext/upload_facts.rb
-- ext/vim/README
-- ext/vim/ftdetect/puppet.vim
-- ext/vim/ftplugin/puppet.vim
-- ext/vim/indent/puppet.vim
-- ext/vim/syntax/puppet.vim
-- ext/windows/eventlog/Rakefile
-- ext/windows/eventlog/puppetres.dll
-- ext/windows/eventlog/puppetres.mc
-- ext/windows/puppet_interactive.bat
-- ext/windows/puppet_shell.bat
-- ext/windows/run_puppet_interactive.bat
-- ext/windows/service/daemon.bat
-- ext/windows/service/daemon.rb
-- ext/yaml_nodes.rb
-- install.rb
 - lib/hiera/puppet_function.rb
 - lib/hiera/scope.rb
 - lib/hiera_puppet.rb
@@ -1531,8 +1386,10 @@ files:
 - lib/puppet/version.rb
 - lib/puppet_x.rb
 - lib/semver.rb
-- locales/config.yaml
-- locales/puppet.pot
+- conf/auth.conf
+- conf/environment.conf
+- conf/fileserver.conf
+- conf/puppet.conf
 - man/man5/puppet.conf.5
 - man/man8/extlookup2hiera.8
 - man/man8/puppet-agent.8
@@ -1565,6 +1422,155 @@ files:
 - man/man8/puppet-resource_type.8
 - man/man8/puppet-status.8
 - man/man8/puppet.8
+- examples/hiera/README.md
+- examples/hiera/etc/hiera.yaml
+- examples/hiera/etc/hieradb/common.yaml
+- examples/hiera/etc/hieradb/dc1.yaml
+- examples/hiera/etc/hieradb/development.yaml
+- examples/hiera/etc/puppet.conf
+- examples/hiera/modules/data/manifests/common.pp
+- examples/hiera/modules/ntp/manifests/config.pp
+- examples/hiera/modules/ntp/manifests/data.pp
+- examples/hiera/modules/ntp/templates/ntp.conf.erb
+- examples/hiera/modules/users/manifests/common.pp
+- examples/hiera/modules/users/manifests/dc1.pp
+- examples/hiera/modules/users/manifests/development.pp
+- examples/hiera/site.pp
+- ext/README.environment
+- ext/autotest/Rakefile
+- ext/autotest/config
+- ext/autotest/readme.rst
+- ext/build_defaults.yaml
+- ext/cert_inspector
+- ext/dbfix.sql
+- ext/debian/README.Debian
+- ext/debian/README.source
+- ext/debian/TODO.Debian
+- ext/debian/changelog.erb
+- ext/debian/compat
+- ext/debian/control
+- ext/debian/copyright
+- ext/debian/docs
+- ext/debian/fileserver.conf
+- ext/debian/puppet-common.dirs
+- ext/debian/puppet-common.install
+- ext/debian/puppet-common.lintian-overrides
+- ext/debian/puppet-common.manpages
+- ext/debian/puppet-common.postinst
+- ext/debian/puppet-common.postrm
+- ext/debian/puppet-el.dirs
+- ext/debian/puppet-el.emacsen-install
+- ext/debian/puppet-el.emacsen-remove
+- ext/debian/puppet-el.emacsen-startup
+- ext/debian/puppet-el.install
+- ext/debian/puppet-testsuite.install
+- ext/debian/puppet-testsuite.lintian-overrides
+- ext/debian/puppet.default
+- ext/debian/puppet.init
+- ext/debian/puppet.lintian-overrides
+- ext/debian/puppet.logrotate
+- ext/debian/puppet.postinst
+- ext/debian/puppet.postrm
+- ext/debian/puppet.preinst
+- ext/debian/puppetmaster-common.install
+- ext/debian/puppetmaster-common.manpages
+- ext/debian/puppetmaster-common.postinst
+- ext/debian/puppetmaster-passenger.dirs
+- ext/debian/puppetmaster-passenger.postinst
+- ext/debian/puppetmaster-passenger.postrm
+- ext/debian/puppetmaster.README.debian
+- ext/debian/puppetmaster.default
+- ext/debian/puppetmaster.init
+- ext/debian/puppetmaster.lintian-overrides
+- ext/debian/puppetmaster.postinst
+- ext/debian/puppetmaster.postrm
+- ext/debian/puppetmaster.preinst
+- ext/debian/rules
+- ext/debian/source/format
+- ext/debian/source/options
+- ext/debian/vim-puppet.README.Debian
+- ext/debian/vim-puppet.dirs
+- ext/debian/vim-puppet.yaml
+- ext/debian/watch
+- ext/emacs/puppet-mode-init.el
+- ext/emacs/puppet-mode.el
+- ext/envpuppet
+- ext/envpuppet.bat
+- ext/freebsd/puppetd
+- ext/freebsd/puppetmasterd
+- ext/gentoo/conf.d/puppet
+- ext/gentoo/conf.d/puppetmaster
+- ext/gentoo/init.d/puppet
+- ext/gentoo/init.d/puppetmaster
+- ext/gentoo/puppet/fileserver.conf
+- ext/ips/puppet-agent
+- ext/ips/puppet-master
+- ext/ips/puppet.p5m.erb
+- ext/ips/puppetagent.xml
+- ext/ips/puppetmaster.xml
+- ext/ips/rules
+- ext/ips/transforms
+- ext/ldap/puppet.schema
+- ext/logcheck/puppet
+- ext/nagios/check_puppet.rb
+- ext/osx/file_mapping.yaml
+- ext/osx/postflight.erb
+- ext/osx/preflight.erb
+- ext/osx/prototype.plist.erb
+- ext/osx/puppet.plist
+- ext/project_data.yaml
+- ext/puppet-test
+- ext/pure_ruby_dsl/dsl_test.rb
+- ext/rack/config.ru
+- ext/rack/example-passenger-vhost.conf
+- ext/redhat/client.init
+- ext/redhat/client.sysconfig
+- ext/redhat/fileserver.conf
+- ext/redhat/logrotate
+- ext/redhat/puppet.spec.erb
+- ext/redhat/server.init
+- ext/redhat/server.sysconfig
+- ext/regexp_nodes/classes/databases
+- ext/regexp_nodes/classes/webservers
+- ext/regexp_nodes/environment/development
+- ext/regexp_nodes/parameters/service/prod
+- ext/regexp_nodes/parameters/service/qa
+- ext/regexp_nodes/parameters/service/sandbox
+- ext/regexp_nodes/regexp_nodes.rb
+- ext/solaris/pkginfo
+- ext/solaris/smf/puppet
+- ext/solaris/smf/puppet.xml
+- ext/solaris/smf/puppetd.xml
+- ext/solaris/smf/puppetmasterd.xml
+- ext/solaris/smf/svc-puppetd
+- ext/solaris/smf/svc-puppetmasterd
+- ext/suse/client.init
+- ext/suse/puppet.spec
+- ext/suse/server.init
+- ext/systemd/puppet.service
+- ext/upload_facts.rb
+- ext/vim/README
+- ext/vim/ftdetect/puppet.vim
+- ext/vim/ftplugin/puppet.vim
+- ext/vim/indent/puppet.vim
+- ext/vim/syntax/puppet.vim
+- ext/windows/eventlog/Rakefile
+- ext/windows/eventlog/puppetres.dll
+- ext/windows/eventlog/puppetres.mc
+- ext/windows/puppet_interactive.bat
+- ext/windows/puppet_shell.bat
+- ext/windows/run_puppet_interactive.bat
+- ext/windows/service/daemon.bat
+- ext/windows/service/daemon.rb
+- ext/yaml_nodes.rb
+- tasks/benchmark.rake
+- tasks/cfpropertylist.rake
+- tasks/ci.rake
+- tasks/manpages.rake
+- tasks/memwalk.rake
+- tasks/parallel.rake
+- tasks/parser.rake
+- tasks/yard.rake
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
 - spec/fixtures/hiera.yaml
 - spec/fixtures/integration/node/environment/sitedir/00_a.pp
@@ -2816,39 +2822,33 @@ files:
 - spec/unit/util_spec.rb
 - spec/unit/version_spec.rb
 - spec/watchr.rb
-- tasks/benchmark.rake
-- tasks/cfpropertylist.rake
-- tasks/ci.rake
-- tasks/manpages.rake
-- tasks/memwalk.rake
-- tasks/parallel.rake
-- tasks/parser.rake
-- tasks/yard.rake
+- locales/config.yaml
+- locales/puppet.pot
 homepage: https://github.com/puppetlabs/puppet
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--title"
+- --title
 - Puppet - Configuration Management
-- "--main"
+- --main
 - README.md
-- "--line-numbers"
+- --line-numbers
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: puppet
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Puppet, an automated configuration management tool