promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
3 changed files with 34 additions and 0 deletions
Showing only changes of commit c9a1d35af9 - Show all commits

View File

@ -82,3 +82,8 @@ profiles::haproxy::certlist::certificates:
profiles::pki::vault::alt_names: profiles::pki::vault::alt_names:
- puppetboard.main.unkin.net - puppetboard.main.unkin.net
- puppetdbapi.main.unkin.net - puppetdbapi.main.unkin.net
# additional cnames
profiles::haproxy::dns::cnames:
- puppetboard.main.unkin.net
- puppetdbapi.main.unkin.net

View File

@ -0,0 +1,27 @@
# profiles::haproxy::dns
class profiles::haproxy::dns (
Array[Stdlib::Fqdn] $cnames = [],
Integer $order = 10,
){
# create an A record for each load balancer in a region
$location_environment = "${facts['country']}-${facts['region']}-${facts['environment']}"
profiles::dns::record { "${facts['networking']['fqdn']}_${location_environment}-halb_A":
value => $::facts['networking']['ip'],
type => 'A',
record => "${location_environment}-halb",
zone => $::facts['networking']['domain'],
order => $order,
}
# export cnames for haproxy applications
$cnames.each |$cname| {
profiles::dns::record { "${::facts['networking']['fqdn']}_${cname}_CNAME":
value => "${location_environment}-halb",
type => 'CNAME',
record => "${cname}.",
zone => $::facts['networking']['domain'],
order => $order,
}
}
}

View File

@ -2,6 +2,7 @@
class profiles::haproxy::server ( class profiles::haproxy::server (
Hash $globals = {}, Hash $globals = {},
Hash $defaults = {}, Hash $defaults = {},
Array $cnames = [],
){ ){
# default global/defaults arrays # default global/defaults arrays
@ -50,6 +51,7 @@ class profiles::haproxy::server (
include profiles::haproxy::ls_stats # default status listener include profiles::haproxy::ls_stats # default status listener
include profiles::haproxy::fe_http # default http frontend include profiles::haproxy::fe_http # default http frontend
include profiles::haproxy::fe_https # default https frontend include profiles::haproxy::fe_https # default https frontend
include profiles::haproxy::dns # manage dns for haproxy
# for each backend: # for each backend:
$backends = lookup('profiles::haproxy::backends') $backends = lookup('profiles::haproxy::backends')