promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
4 changed files with 17 additions and 1 deletions
Showing only changes of commit 2d10f9e861 - Show all commits

View File

@ -14,3 +14,7 @@ profiles::puppet::g10k::bin_path: '/opt/puppetlabs/bin/g10k'
profiles::puppet::g10k::cfg_path: '/etc/puppetlabs/r10k/r10k.yaml' profiles::puppet::g10k::cfg_path: '/etc/puppetlabs/r10k/r10k.yaml'
profiles::puppet::g10k::environments_path: '/etc/puppetlabs/code/environments' profiles::puppet::g10k::environments_path: '/etc/puppetlabs/code/environments'
profiles::puppet::g10k::default_environment: 'develop' profiles::puppet::g10k::default_environment: 'develop'
profiles::puppet::gems::puppet:
- 'deep_merge'
- 'ipaddr'
- 'hiera-eyaml'

View File

@ -0,0 +1,12 @@
# profiles::puppet::gems
class profiles::puppet::gems (
Array $puppet = [],
){
# install puppetmaster gems
$puppet.each | $pgem | {
package { $pgem:
ensure => installed,
provider => 'puppet_gem',
}
}
}

View File

@ -29,6 +29,7 @@ class profiles::puppet::puppetmaster (
include profiles::puppet::g10k include profiles::puppet::g10k
include profiles::puppet::enc include profiles::puppet::enc
include profiles::puppet::autosign include profiles::puppet::autosign
include profiles::puppet::gems
class { 'puppetdb::master::config': class { 'puppetdb::master::config':
puppetdb_server => $puppetdb_host, puppetdb_server => $puppetdb_host,

View File

@ -66,4 +66,3 @@ class profiles::puppet::server (
hasrestart => true, hasrestart => true,
} }
} }