Fixed code so hunner/hiera can be pulled from forge
This commit is contained in:
parent
36737bb5fc
commit
b415200eb0
@ -3,6 +3,7 @@ forge "http://forge.puppetlabs.com"
|
|||||||
# Modules from the Puppet Forge
|
# Modules from the Puppet Forge
|
||||||
# Note the versions are all set to :latest but after you've
|
# Note the versions are all set to :latest but after you've
|
||||||
# installed you should change them to the exact version you want
|
# installed you should change them to the exact version you want
|
||||||
|
mod "hunner/hiera", :latest
|
||||||
mod "puppetlabs/inifile", :latest
|
mod "puppetlabs/inifile", :latest
|
||||||
mod "puppetlabs/stdlib", :latest
|
mod "puppetlabs/stdlib", :latest
|
||||||
mod "puppetlabs/concat", :latest
|
mod "puppetlabs/concat", :latest
|
||||||
@ -19,10 +20,6 @@ mod "puppetlabs/java", '1.4.1'
|
|||||||
# Modules from Github using various references
|
# Modules from Github using various references
|
||||||
# Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
|
# Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
|
||||||
# update the tag to the most current release when implementing
|
# 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',
|
mod 'gitlab',
|
||||||
:git => 'https://github.com/vshn/puppet-gitlab',
|
:git => 'https://github.com/vshn/puppet-gitlab',
|
||||||
:ref => '00397b86dfb3487d9df768cbd3698d362132b5bf'
|
:ref => '00397b86dfb3487d9df768cbd3698d362132b5bf'
|
||||||
|
@ -15,15 +15,6 @@ class profile::puppetmaster {
|
|||||||
notify => Service['pe-puppetserver'],
|
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' :
|
ini_setting { 'puppet.conf hiera_config master section' :
|
||||||
ensure => absent,
|
ensure => absent,
|
||||||
path => "${::settings::confdir}/puppet.conf",
|
path => "${::settings::confdir}/puppet.conf",
|
||||||
|
Loading…
Reference in New Issue
Block a user