From b415200eb04db098de02806c526310996bc90a8a Mon Sep 17 00:00:00 2001 From: "Patrick St. Jean" Date: Thu, 4 Feb 2016 11:34:52 -0600 Subject: [PATCH 1/2] Fixed code so hunner/hiera can be pulled from forge --- Puppetfile | 5 +---- site/profile/manifests/puppetmaster.pp | 9 --------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Puppetfile b/Puppetfile index 6bc31f8..9efbec1 100644 --- a/Puppetfile +++ b/Puppetfile @@ -3,6 +3,7 @@ forge "http://forge.puppetlabs.com" # Modules from the Puppet Forge # Note the versions are all set to :latest but after you've # installed you should change them to the exact version you want +mod "hunner/hiera", :latest mod "puppetlabs/inifile", :latest mod "puppetlabs/stdlib", :latest mod "puppetlabs/concat", :latest @@ -19,10 +20,6 @@ mod "puppetlabs/java", '1.4.1' # Modules from Github using various references # Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples # update the tag to the most current release when implementing -mod 'hiera', - :git => 'https://github.com/hunner/puppet-hiera', - :tag => '1.3.1' - mod 'gitlab', :git => 'https://github.com/vshn/puppet-gitlab', :ref => '00397b86dfb3487d9df768cbd3698d362132b5bf' diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp index 8a1b161..0e68ddb 100644 --- a/site/profile/manifests/puppetmaster.pp +++ b/site/profile/manifests/puppetmaster.pp @@ -15,15 +15,6 @@ class profile::puppetmaster { notify => Service['pe-puppetserver'], } - ini_setting { 'puppet.conf hiera_config main section' : - ensure => present, - path => "${::settings::confdir}/puppet.conf", - section => 'main', - setting => 'hiera_config', - value => $hiera_yaml, - notify => Service['pe-puppetserver'], - } - ini_setting { 'puppet.conf hiera_config master section' : ensure => absent, path => "${::settings::confdir}/puppet.conf", From 7f967d1f8b3feefb03041e2a1602ed573c4f3490 Mon Sep 17 00:00:00 2001 From: "Patrick St. Jean" Date: Thu, 4 Feb 2016 14:22:40 -0600 Subject: [PATCH 2/2] Changed :latest to 2.0.1 for hunner/hiera --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index 9efbec1..61013d8 100644 --- a/Puppetfile +++ b/Puppetfile @@ -3,7 +3,7 @@ forge "http://forge.puppetlabs.com" # Modules from the Puppet Forge # Note the versions are all set to :latest but after you've # installed you should change them to the exact version you want -mod "hunner/hiera", :latest +mod "hunner/hiera", '2.0.1' mod "puppetlabs/inifile", :latest mod "puppetlabs/stdlib", :latest mod "puppetlabs/concat", :latest