From 5817d9aee4b994396eec1dd2458015b5ee120c35 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
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 @@
     <variables>
         <family name="Services">
            <variable name="dbEnable" type='oui/non' description='Activer le serveur de base de données MariaDB'>
-              <value>non</value>
+              <value>oui</value>
            </variable>
            <variable name="dbEnableBackup" type='oui/non' description='Activer la sauvegarde sur le serveur de base de données MariaDB'>
               <value>non</value>
            </variable>
         </family>
-        <family name="Database">
+        <family name="MariaDB" icon='mysql-alt'>
             <variable name='dbEnableCluster' type='oui/non' description="Activer la mise en grappe MariaDB Galera ?">
                 <value>non</value>
             </variable> 
@@ -51,13 +51,10 @@
             </variable>
             <variable name="accLimitTarget" type="string" description="Restriction d'accès à ces IP/noms d'hôtes (liste séparateur séparateur ',')" />
 
-            <variable name="dbClusterGcacheSizeMb" type="number" description="FIXME Gcachesize">
-                <value>128</value>
-            </variable>
         </family>
 
         <!-- Tunning -->
-        <family name="Database Tunning" mode="expert">
+        <family name="MariaDB Tunning" mode="expert" icon='mysql-alt'>
             <variable name="dbInnoDBBufferPoolPercentage" type="number" description="Pourcentage de mémoire à dédier à MariaDB">
                 <value>20</value>
             </variable>
@@ -114,18 +111,16 @@
             </variable>
         </family>
 
-        <family name="Database Cluster">
+        <family name="Grappe MariaDB" icon='mysql-alt'>
             <variable name='dbClusterPosition' type='string' description="Rôle dans la grappe" mandatory='True'/>
-            <variable name='ifDBCluster' type='string' description="Interface réseau dédiée à la grappe BDD"/>
-            <!-- FIXME : Fill this variable with nom_machine -->
-            <variable name='nodeName' type='string' description="Nom du noeud local"/>
-
-            <variable name='dbClusterMember' type='string' description="Membre de la grappe BDD" multi='True'/>
-            <variable name='dbClusterMemberIP' type='ip' description="Adresse IP"/>
-            <!-- Expert Variables -->
             <variable name='dbClusterName' type='string' description='Nom de la grappe'>
                <value>galera_cluster</value>
             </variable>
+            <variable name='ifDBCluster' type='string' description="Interface réseau dédiée à la grappe BDD"/>
+            <variable name='nodeName' type='domain' description="Nom de domaine du noeud"/>
+
+            <variable name='dbClusterMember' type='domain' description="Nom de domaine des membres de la grappe"/>
+            <!-- Expert Variables -->
             <variable name='dbBinLogFormat' type='string' mode='expert' description='Format du binlog'>
                <value>ROW</value>
             </variable>
@@ -135,7 +130,7 @@
             <variable name='dbSSTMethod' type='string' mode='expert' description='Méthode SST'>
                <value>rsync</value>
             </variable>
-            <variable name='dbClusterGcacheSize' type='number' mode='expert' description="Write-set Cache Size (gcache.size)">
+            <variable name='dbClusterGcacheSizeMb' type='number' mode='expert' description="Write-set Cache Size (gcache.size)">
                 <value>128</value>
             </variable>
             <!-- End -->
@@ -149,14 +144,13 @@
             <param type='eole'>ipMariaDBLimit</param>
         </check>	
 
+        <check name='valid_enum' target='dbBinLogFormatr'>
+            <param>['ROW', 'STATEMENT', 'MIXED', 'NONE']</param>
+        </check>
         <check name='valid_enum' target='ifDBCluster'>
             <param>['eth0', 'eth1', 'eth2', 'eth3', 'eth4']</param>
         </check>
 
-        <group master='dbClusterMember'>
-            <slave>dbClusterMemberIP</slave>
-        </group>
-
         <check name='valid_enum' target='accLimits'>
             <param>['Default','Custom']</param>
         </check>
@@ -175,6 +169,9 @@
            <slave>ifMariaDBLimit</slave>
         </group>
 
+        <fill name='calc_multi_condition' target='nodeName'>
+            <param type='eole'>nom_domaine_machine</param>
+        </fill>
         <fill name='calc_multi_condition' target='accLimitTarget'>
             <param>Default</param>
             <param type='eole' name='condition_1'>accLimits</param>
@@ -184,13 +181,13 @@
 
         <condition name='disabled_if_in' source="dbEnable">
             <param>non</param>
-            <target type='family'>Database</target>
-            <target type='family'>Database Cluster</target>
-            <target type='family'>Database Tunning</target>
-            <target type='service_accesslist'>dbCluster</target>
+            <target type='family'>MariaDB</target>
+            <!--target type='family'>Grappe MariaDB</target-->
+            <target type='family'>MariaDB Tunning</target>
+            <!--target type='service_accesslist'>dbCluster</target-->
             <target type='filelist'>dbTunning</target>
             <target type='filelist'>dbMariaDB</target>
-            <target type='filelist'>dbCluster</target>
+            <!--target type='filelist'>dbCluster</target-->
             <target type='servicelist'>bdd</target>
         </condition>
 
@@ -203,7 +200,7 @@
 
         <condition name='disabled_if_in' source="dbEnableCluster">
             <param>non</param>
-            <target type='family'>Database Cluster</target>
+            <target type='family'>Grappe MariaDB</target>
             <target type='service_accesslist'>dbCluster</target>
             <target type='filelist'>dbCluster</target>
         </condition>
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 <egarette@cadoles.com>
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 @@
         </service_restriction>
 
         <service_restriction service='galera'>
-           <ip interface='ifDBCluster' interface_type="SymLinkOption" netmask='255.255.255.255' ip_type='SymLinkOption'>dbClusterMemberIP</ip>
+           <ip interface='ifDBCluster' interface_type="SymLinkOption" netmask='255.255.255.255' ip_type='SymLinkOption'>dbClusterMember</ip>
         </service_restriction>
     </files>
     <variables>
@@ -119,7 +119,7 @@
             <variable name='ifDBCluster' type='string' description="Interface réseau dédiée à la grappe BDD"/>
             <variable name='nodeName' type='domain' description="Nom de domaine du noeud"/>
 
-            <variable name='dbClusterMember' type='domain' description="Nom de domaine des membres de la grappe"/>
+            <variable name='dbClusterMember' type='domain' description="Nom de domaine des membres de la grappe" multi="True"/>
             <!-- Expert Variables -->
             <variable name='dbBinLogFormat' type='string' mode='expert' description='Format du binlog'>
                <value>ROW</value>
@@ -144,7 +144,7 @@
             <param type='eole'>ipMariaDBLimit</param>
         </check>	
 
-        <check name='valid_enum' target='dbBinLogFormatr'>
+        <check name='valid_enum' target='dbBinLogFormat'>
             <param>['ROW', 'STATEMENT', 'MIXED', 'NONE']</param>
         </check>
         <check name='valid_enum' target='ifDBCluster'>
@@ -169,7 +169,7 @@
            <slave>ifMariaDBLimit</slave>
         </group>
 
-        <fill name='calc_multi_condition' target='nodeName'>
+        <fill name='calc_val' target='nodeName'>
             <param type='eole'>nom_domaine_machine</param>
         </fill>
         <fill name='calc_multi_condition' target='accLimitTarget'>