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.
This commit is contained in:
parent
55f983ffc9
commit
9503f54349
@ -40,3 +40,7 @@ mod 'gms',
|
|||||||
mod 'pltraining-rbac',
|
mod 'pltraining-rbac',
|
||||||
:git => 'https://github.com/puppetlabs/pltraining-rbac',
|
:git => 'https://github.com/puppetlabs/pltraining-rbac',
|
||||||
:ref => '2f60e1789a721ce83f8df061e13f8bf81cd4e4ce'
|
:ref => '2f60e1789a721ce83f8df061e13f8bf81cd4e4ce'
|
||||||
|
|
||||||
|
mod 'rampup_profile_puppetmaster',
|
||||||
|
:git => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_puppetmaster',
|
||||||
|
:branch => 'master'
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
#https://docs.puppetlabs.com/pe/latest/nc_update_classes.html#post-v1update-classes
|
|
||||||
|
|
||||||
CONFDIR=$(puppet master --configprint confdir)
|
|
||||||
|
|
||||||
CERT=$(puppet master --confdir ${CONFDIR} --configprint hostcert)
|
|
||||||
CACERT=$(puppet master --confdir ${CONFDIR} --configprint localcacert)
|
|
||||||
PRVKEY=$(puppet master --confdir ${CONFDIR} --configprint hostprivkey)
|
|
||||||
OPTIONS="--cert ${CERT} --cacert ${CACERT} --key ${PRVKEY}"
|
|
||||||
CONSOLE=$(awk '/server: /{print $NF}' ${CONFDIR}/classifier.yaml)
|
|
||||||
|
|
||||||
curl -k -X POST ${OPTIONS} "https://${CONSOLE}:4433/classifier-api/v1/update-classes"
|
|
@ -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'],
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,6 +1,6 @@
|
|||||||
class role::all_in_one_pe {
|
class role::all_in_one_pe {
|
||||||
|
|
||||||
include profile::puppetmaster
|
include rampup_profile_puppetmaster
|
||||||
include pe_code_manager_webhook
|
include pe_code_manager_webhook
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user