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

promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
Conversation 0 Commits 449 Files Changed 291 +13 -8
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eeb21081d3 - Show all commits

2
hieradata/nodes/prodinf01n48.main.unkin.net.yaml Normal file
View File

@ -0,0 +1,2 @@
---
profiles::cobbler::params::is_cobbler_master: true

18
site/profiles/manifests/cobbler/config.pp
View File

@ -7,6 +7,7 @@ class profiles::cobbler::config {
$httpd_ssl_certificate = $profiles::cobbler::params::httpd_ssl_certificate $httpd_ssl_certificate = $profiles::cobbler::params::httpd_ssl_certificate
$httpd_ssl_privatekey = $profiles::cobbler::params::httpd_ssl_privatekey $httpd_ssl_privatekey = $profiles::cobbler::params::httpd_ssl_privatekey
$pxe_just_once = $profiles::cobbler::params::pxe_just_once $pxe_just_once = $profiles::cobbler::params::pxe_just_once
$is_cobbler_master = $profiles::cobbler::params::is_cobbler_master
$service_cname = $profiles::cobbler::params::service_cname $service_cname = $profiles::cobbler::params::service_cname
$next_server = $profiles::cobbler::params::next_server $next_server = $profiles::cobbler::params::next_server
$server = $profiles::cobbler::params::server $server = $profiles::cobbler::params::server
@ -64,12 +65,13 @@ class profiles::cobbler::config {
} }
# export cnames for cobbler # export cnames for cobbler
#profiles::dns::record { "${::facts['networking']['fqdn']}_${service_cname}_CNAME": if $is_cobbler_master {
# value => $::facts['networking']['hostname'], profiles::dns::record { "${::facts['networking']['fqdn']}_${service_cname}_CNAME":
# type => 'CNAME', value => $::facts['networking']['hostname'],
# record => "${service_cname}.", type => 'CNAME',
# zone => $::facts['networking']['domain'], record => "${service_cname}.",
# order => 10, zone => $::facts['networking']['domain'],
#} order => 10,
}
}
} }

1
site/profiles/manifests/cobbler/params.pp
View File

@ -8,6 +8,7 @@ class profiles::cobbler::params (
String $server = $::facts['networking']['ip'], String $server = $::facts['networking']['ip'],
String $next_server = $::facts['networking']['ip'], String $next_server = $::facts['networking']['ip'],
Boolean $pxe_just_once = true, Boolean $pxe_just_once = true,
Boolean $is_cobbler_master = false,
Array $packages = [ Array $packages = [
'cobbler', 'cobbler',
'cobbler3.2-web', 'cobbler3.2-web',