From 5817d9aee4b994396eec1dd2458015b5ee120c35 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Tue, 19 Feb 2019 16:37:00 +0100 Subject: [PATCH 1/2] simplification + nom de domaine plutot que IP --- dicos/25_bdd_server.xml | 47 +++++++++++++++++++---------------------- tmpl/galera.cnf | 11 +++------- 2 files changed, 25 insertions(+), 33 deletions(-) diff --git a/dicos/25_bdd_server.xml b/dicos/25_bdd_server.xml index d82d563..4cd01ca 100644 --- a/dicos/25_bdd_server.xml +++ b/dicos/25_bdd_server.xml @@ -28,13 +28,13 @@ - non + oui non - + non @@ -51,13 +51,10 @@ - - 128 - - + 20 @@ -114,18 +111,16 @@ - + - - - - - - - galera_cluster + + + + + ROW @@ -135,7 +130,7 @@ rsync - + 128 @@ -149,14 +144,13 @@ ipMariaDBLimit + + ['ROW', 'STATEMENT', 'MIXED', 'NONE'] + ['eth0', 'eth1', 'eth2', 'eth3', 'eth4'] - - dbClusterMemberIP - - ['Default','Custom'] @@ -175,6 +169,9 @@ ifMariaDBLimit + + nom_domaine_machine + Default accLimits @@ -184,13 +181,13 @@ non - Database - Database Cluster - Database Tunning - dbCluster + MariaDB + + MariaDB Tunning + dbTunning dbMariaDB - dbCluster + bdd @@ -203,7 +200,7 @@ non - Database Cluster + Grappe MariaDB dbCluster dbCluster diff --git a/tmpl/galera.cnf b/tmpl/galera.cnf index 94cab58..e455286 100644 --- a/tmpl/galera.cnf +++ b/tmpl/galera.cnf @@ -8,12 +8,7 @@ wsrep_on=ON wsrep_provider=/usr/lib/galera/libgalera_smm.so # Galera Cluster Configuration wsrep_cluster_name="%%dbClusterName" -%set %%nodeIP = %%getVar('adresse_ip_' + %%ifDBCluster, '') -wsrep_cluster_address="gcomm://%%nodeIP%slurp -%for %%node in %%dbClusterMember -,%%node.dbClusterMemberIP%slurp -%end for -" +wsrep_cluster_address="gcomm://%%nodeName,%%custom_join(%%dbClusterMember, ',')" # Tunning wsrep_provider_options="gcache.size=%%dbClusterGcacheSizeMb" @@ -22,5 +17,5 @@ wsrep_provider_options="gcache.size=%%dbClusterGcacheSizeMb" wsrep_sst_method=%%dbSSTMethod # Galera Node Configuration -wsrep_node_address="%%nodeIP" -wsrep_node_name="%%nodeName" \ No newline at end of file +wsrep_node_address="%%getVar('adresse_ip_' + %%ifDBCluster)" +wsrep_node_name="%%nodeName" From 7800e9e20a0459c5a89fba9b53d90891ce8e9ed6 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Tue, 19 Feb 2019 16:51:14 +0100 Subject: [PATCH 2/2] corrections --- dicos/25_bdd_server.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dicos/25_bdd_server.xml b/dicos/25_bdd_server.xml index 4cd01ca..f151ba1 100644 --- a/dicos/25_bdd_server.xml +++ b/dicos/25_bdd_server.xml @@ -22,7 +22,7 @@ - dbClusterMemberIP + dbClusterMember @@ -119,7 +119,7 @@ - + ROW @@ -144,7 +144,7 @@ ipMariaDBLimit - + ['ROW', 'STATEMENT', 'MIXED', 'NONE'] @@ -169,7 +169,7 @@ ifMariaDBLimit - + nom_domaine_machine