From 9503f54349756fe7a93eecf2ecc6620c340f4679 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Wed, 23 Mar 2016 15:53:41 -0700 Subject: Move puppetmaster profile to rampup_profile_puppetmaster module Prior to this commit, the puppetmaster profile was embedded in this control-repo. After this commit, the puppetmaster profile is moved out into its own module. --- site/profile/manifests/puppetmaster.pp | 52 ---------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 site/profile/manifests/puppetmaster.pp (limited to 'site/profile/manifests') diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp deleted file mode 100644 index 0e68ddb..0000000 --- a/site/profile/manifests/puppetmaster.pp +++ /dev/null @@ -1,52 +0,0 @@ -class profile::puppetmaster { - - $hiera_yaml = "${::settings::confdir}/hiera.yaml" - - class { 'hiera': - hierarchy => [ - 'virtual/%{::virtual}', - 'nodes/%{::trusted.certname}', - 'common', - ], - hiera_yaml => $hiera_yaml, - datadir => '/etc/puppetlabs/code/environments/%{environment}/hieradata', - owner => 'pe-puppet', - group => 'pe-puppet', - notify => Service['pe-puppetserver'], - } - - ini_setting { 'puppet.conf hiera_config master section' : - ensure => absent, - path => "${::settings::confdir}/puppet.conf", - section => 'master', - setting => 'hiera_config', - value => $hiera_yaml, - notify => Service['pe-puppetserver'], - } - - #remove the default hiera.yaml from the code-staging directory - #after the next code manager deployment it should be removed - #from the live codedir - file { '/etc/puppetlabs/code-staging/hiera.yaml' : - ensure => absent, - } - - #Lay down update-classes.sh for use in r10k postrun_command - #This is configured via the pe_r10k::postrun key in hiera - file { '/usr/local/bin/update-classes.sh' : - ensure => file, - source => 'puppet:///modules/profile/puppetmaster/update-classes.sh', - mode => '0755', - } - - #https://docs.puppetlabs.com/puppet/latest/reference/config_file_environment.html#environmenttimeout - ini_setting { 'environment_timeout = unlimited': - ensure => present, - path => '/etc/puppetlabs/puppet/puppet.conf', - section => 'main', - setting => 'environment_timeout', - value => 'unlimited', - notify => Service['pe-puppetserver'], - } - -} -- cgit v1.2.3