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 +10 -5
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 48b9177e05 - Show all commits

4
hieradata/country/au/region/syd1/infra/sql/galera.yaml Normal file
View File

@ -0,0 +1,4 @@
---
profiles::sql::galera_member::cluster_name: au-syd1
profiles::sql::galera_member::galera_master: ausyd1nxvm1027.main.unkin.net
profiles::sql::galera_member::innodb_buffer_pool_size: 256M

3
hieradata/roles/infra/sql/galera.yaml
View File

@ -1,11 +1,8 @@
--- ---
profiles::sql::galera_member::cluster_name: galera01
profiles::sql::galera_member::galera_master: prodinf01n29.main.unkin.net
profiles::sql::galera_member::configure_firewall: false profiles::sql::galera_member::configure_firewall: false
profiles::sql::galera_member::wsrep_sst_method: rsync profiles::sql::galera_member::wsrep_sst_method: rsync
profiles::sql::galera_member::galera_members_lookup: true profiles::sql::galera_member::galera_members_lookup: true
profiles::sql::galera_member::galera_members_role: roles::infra::sql::galera profiles::sql::galera_member::galera_members_role: roles::infra::sql::galera
profiles::sql::galera_member::datadir: /data/mariadb profiles::sql::galera_member::datadir: /data/mariadb
profiles::sql::galera_member::innodb_buffer_pool_size: 256M
profiles::sql::galera_member::innodb_file_per_table: 1 profiles::sql::galera_member::innodb_file_per_table: 1
profiles::sql::galera_member::package_name: mariadb-galera-server profiles::sql::galera_member::package_name: mariadb-galera-server

3
site/profiles/manifests/sql/galera_member.pp
View File

@ -47,7 +47,7 @@ class profiles::sql::galera_member (
} }
# if it is, find hosts, sort them so they dont cause changes every run # if it is, find hosts, sort them so they dont cause changes every run
$servers_array = sort(query_nodes("enc_role='${galera_members_role}'", 'networking.fqdn')) $servers_array = sort(query_nodes("enc_role='${galera_members_role}' and region='${facts['region']}'", 'networking.fqdn'))
# else use provided array from params # else use provided array from params
}else{ }else{
@ -211,4 +211,5 @@ class profiles::sql::galera_member (
}else{ }else{
notice("${title} requires the servers_array to have 3 or more, currently it is ${length($servers_array)}.") notice("${title} requires the servers_array to have 3 or more, currently it is ${length($servers_array)}.")
} }
} }

3
site/roles/manifests/infra/sql/galera.pp
View File

@ -3,5 +3,8 @@ class roles::infra::sql::galera {
include profiles::defaults include profiles::defaults
include profiles::base include profiles::base
include profiles::base::datavol include profiles::base::datavol
if $facts['enc_role'] == 'roles::infra::sql::galera' {
include profiles::sql::galera_member include profiles::sql::galera_member
} }
}