Drive/sunetdrive
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into stable

Browse source
This commit is contained in:
Micke Nordin 2023-07-25 08:15:40 +02:00
commit d0ca012129
Signed by untrusted user: Micke
GPG key ID: 0DA0A7A5708FE257
4 changed files with 30 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manifests/db_type.pp
View file

@ -5,7 +5,6 @@ define sunetdrive::db_type(
$location=undef, $location=undef,
$override_config = undef, $override_config = undef,
$override_compose = undef, $override_compose = undef,
$replicate_rewrite_db = undef,
) )
{ {

2
manifests/mariadb.pp
View file

@ -5,7 +5,6 @@ class sunetdrive::mariadb (
$tag_mariadb = undef, $tag_mariadb = undef,
$override_config = undef, $override_config = undef,
$override_compose = undef, $override_compose = undef,
$replicate_rewrite_db = undef,
) { ) {
$quorum_id = $facts['networking']['fqdn'] $quorum_id = $facts['networking']['fqdn']
@ -14,7 +13,6 @@ class sunetdrive::mariadb (
bootstrap => $bootstrap, bootstrap => $bootstrap,
tag_mariadb => $tag_mariadb, tag_mariadb => $tag_mariadb,
location => $location, location => $location,
replicate_rewrite_db => $replicate_rewrite_db,
} }
file { '/etc/quorum.conf': file { '/etc/quorum.conf':
ensure => file, ensure => file,

4
templates/mariadb/my.cnf.erb
View file

@ -19,10 +19,6 @@ gtid_strict_mode = ON
log_bin = binlog log_bin = binlog
log_slave_updates = ON log_slave_updates = ON
server_id = <%= @server_id %> server_id = <%= @server_id %>
<% if not @replicate_rewrite_db.nil? -%>
replicate-rewrite-db = "<%= @replicate_rewrite_db %>->nextcloud"
replicate-wild-do-table = <%= @replicate_rewrite_db %>.%
<% end -%>
# Innodb # Innodb
innodb_autoinc_lock_mode = 2 innodb_autoinc_lock_mode = 2

5
templates/script/restart-db-cluster.erb
View file

@ -51,7 +51,7 @@ def remove_downtime(fqdn: str,
def main() -> int: def main() -> int:
customer = "<%= @customer %>" customers = ["<%= @customer %>"]
environment = "<%= @environment %>" environment = "<%= @environment %>"
apikey_test = "<%= @apikey_test %>" apikey_test = "<%= @apikey_test %>"
apikey_prod = "<%= @apikey_prod %>" apikey_prod = "<%= @apikey_prod %>"
@ -59,6 +59,9 @@ def main() -> int:
reboot_command = ['sudo /usr/local/bin/safer_reboot'] reboot_command = ['sudo /usr/local/bin/safer_reboot']
if customers[0] == "common":
customers = ["gss", "lookup", "multinode"]
for customer in customers:
for number in reversed(range(1, 4)): for number in reversed(range(1, 4)):
fqdn = build_fqdn(customer, environment, number) fqdn = build_fqdn(customer, environment, number)
ipv4, _ = get_ips_for_hostname(fqdn) ipv4, _ = get_ips_for_hostname(fqdn)