unkin/puppet-prod
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Adding a default environment' (#22) from feature/default_environment into develop

Browse Source 
Reviewed-on: unkinben/puppet-prod#22
This commit is contained in:
Ben Vincent 2023-08-26 19:21:27 +09:30
commit ea7561a093
6 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hieradata/common.yaml
View File

@ -32,3 +32,7 @@ profiles::puppet::autosign::domains:
profiles::puppet::enc::enc_repo: https://git.unkin.net/unkinben/puppet-enc.git
profiles::puppet::r10k::r10k_repo: https://git.unkin.net/unkinben/puppet-r10k.git
profiles::puppet::g10k::bin_path: '/opt/puppetlabs/bin/g10k'
profiles::puppet::g10k::cfg_path: '/etc/puppetlabs/r10k/r10k.yaml'
profiles::puppet::g10k::environments_path: '/etc/puppetlabs/code/environments'
profiles::puppet::g10k::default_environment: 'develop'

10
site/profiles/manifests/puppet/g10k.pp
View File

@ -30,8 +30,12 @@
#
# Limitations:
# This is designed to work on Unix-like systems only.
class profiles::puppet::g10k {
class profiles::puppet::g10k (
String $bin_path,
String $cfg_path,
String $environments_path,
String $default_environment,
){
package { 'unzip':
ensure => installed,
}
@ -50,7 +54,7 @@ class profiles::puppet::g10k {
owner => 'root',
group => 'root',
mode => '0755',
content => "#!/usr/bin/bash\n/opt/puppetlabs/bin/g10k -config /etc/puppetlabs/r10k/r10k.yaml\n",
content => template('profiles/puppet/g10k/puppet-g10k.erb'),
require => Archive['/tmp/g10k.zip'],
}

22
site/profiles/manifests/puppet/puppetmaster.pp
View File

@ -29,12 +29,12 @@ class profiles::puppet::puppetmaster {
include profiles::puppet::autosign
class { 'profiles::puppet::server':
vardir => '/opt/puppetlabs/server/data/puppetserver',
logdir => '/var/log/puppetlabs/puppetserver',
rundir => '/var/run/puppetlabs/puppetserver',
pidfile => '/var/run/puppetlabs/puppetserver/puppetserver.pid',
codedir => '/etc/puppetlabs/code',
dns_alt_names => [
vardir => '/opt/puppetlabs/server/data/puppetserver',
logdir => '/var/log/puppetlabs/puppetserver',
rundir => '/var/run/puppetlabs/puppetserver',
pidfile => '/var/run/puppetlabs/puppetserver/puppetserver.pid',
codedir => '/etc/puppetlabs/code',
dns_alt_names => [
'prodinf01n01.main.unkin.net',
'puppet.main.unkin.net',
'puppetca.main.unkin.net',
@ -43,9 +43,11 @@ class profiles::puppet::puppetmaster {
'puppetca',
'puppetmaster',
],
server => 'prodinf01n01.main.unkin.net',
node_terminus => 'exec',
external_nodes => '/opt/puppetlabs/bin/enc',
autosign => '/etc/puppetlabs/puppet/autosign.conf',
server => 'prodinf01n01.main.unkin.net',
node_terminus => 'exec',
external_nodes => '/opt/puppetlabs/bin/enc',
autosign => '/etc/puppetlabs/puppet/autosign.conf',
default_manifest => '/etc/puppetlabs/code/environments/develop/manifests',
default_environment => 'develop',
}
}

24
site/profiles/manifests/puppet/server.pp
View File

@ -25,6 +25,8 @@ class profiles::puppet::server (
String $node_terminus,
String $external_nodes,
String $autosign,
String $default_manifest,
String $default_environment,
) {
file { '/etc/puppetlabs/puppet/puppet.conf':
@ -33,16 +35,18 @@ class profiles::puppet::server (
group => 'root',
mode => '0644',
content => epp('profiles/puppet/server/puppet.conf.epp', {
'vardir' => $vardir,
'logdir' => $logdir,
'rundir' => $rundir,
'pidfile' => $pidfile,
'codedir' => $codedir,
'dns_alt_names' => join($dns_alt_names, ','),
'server' => $server,
'node_terminus' => $node_terminus,
'external_nodes' => $external_nodes,
'autosign' => $autosign,
'vardir' => $vardir,
'logdir' => $logdir,
'rundir' => $rundir,
'pidfile' => $pidfile,
'codedir' => $codedir,
'dns_alt_names' => join($dns_alt_names, ','),
'server' => $server,
'node_terminus' => $node_terminus,
'external_nodes' => $external_nodes,
'autosign' => $autosign,
'default_manifest' => $default_manifest,
'default_environment' => $default_environment,
}),
notify => Service['puppetserver'],
}

4
site/profiles/templates/puppet/g10k/puppet-g10k.erb Normal file
View File

@ -0,0 +1,4 @@
#!/usr/bin/bash
<%= @bin_path %> -config <%= @cfg_path %>
rm -f <%= @environments_path %>/production
ln -s <%= @environments_path %>/<%= @default_environment %> <%= @environments_path %>/production

2
site/profiles/templates/puppet/server/puppet.conf.epp
View File

@ -15,3 +15,5 @@ server = <%= $server %>
node_terminus = exec
external_nodes = <%= $external_nodes %>
autosign = <%= $autosign %>
default_manifest = <%= $default_manifest %>
default_environment = <%= $default_environment %>