Merge branch 'main' into stable

manifests/db_type.pp

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

manifests/mariadb.pp

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

templates/mariadb/my.cnf.erb

@@ -19,10 +19,6 @@ gtid_strict_mode        = ON
 log_bin                 = binlog
 log_slave_updates       = ON
 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_autoinc_lock_mode        = 2

templates/script/restart-db-cluster.erb

@@ -51,7 +51,7 @@ def remove_downtime(fqdn: str,
 
 
 def main() -> int:
-    customer = "<%= @customer %>"
+    customers = ["<%= @customer %>"]
     environment = "<%= @environment %>"
     apikey_test = "<%= @apikey_test %>"
     apikey_prod = "<%= @apikey_prod %>"
@@ -59,6 +59,9 @@ def main() -> int:
 
     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)):
             fqdn = build_fqdn(customer, environment, number)
             ipv4, _ = get_ips_for_hostname(fqdn)