Merge branch 'master' into dist/eole/2.6.2/master

creolefuncs/mariadb.py

@@ -6,8 +6,8 @@ def getMemoryPercentage(percent):
         percent = int(percent)
         totalMemory = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES')
         memoryToUse = (totalMemory*percent)/100
-        memoryMb = memoryToUse/(1024.**2)
-        return "{0}M".format(int(memoryMb))
+        memoryMb = int(memoryToUse/(1024.**2))
+        return "{0}M".format(memoryMb)
     except:
         return "Error during memory percentage calculation"
 

dicos/25_bdd_server.xml

@@ -2,6 +2,7 @@
 	<files>
 		<file filelist='dbCluster' name='/etc/mysql/conf.d/galera.cnf' rm='True' mkdir='True'/>
 		<file filelist='dbTunning' name='/etc/mysql/conf.d/tunning.cnf' rm='True' mkdir='True'/>
+		<service servicelist='bdd'>mariadb</service>
 		<service_access service='mariadb'>
 			<port service_accesslist='mariadb' protocol='tcp'>3306</port>
             <tcpwrapper service_accesslist='mariadb'>mariadb</tcpwrapper>
@@ -153,6 +154,14 @@
 			<param name='mismatch'>""</param>
 		</fill>
 
+		<condition name='disabled_if_in' source="dbEnable">
+			<param>non</param>
+			<target type='family'>Database Cluster</target>
+			<target type='family'>Database</target>
+			<target type='service_accesslist'>dbCluster</target>
+			<target type='servicelist'>bdd</target>
+		</condition>
+
 		<condition name='disabled_if_in' source="dbCreateFixAdmin">
 			<param>non</param>
 			<target type='variable'>accName</target>
@@ -167,13 +176,6 @@
 			<target type='filelist'>dbCluster</target>
 		</condition>
 
-		<condition name='disabled_if_in' source="dbEnable">
-			<param>non</param>
-			<target type='family'>Database Cluster</target>
-			<target type='family'>Database</target>
-			<target type='service_accesslist'>dbCluster</target>
-		</condition>
-
 		<condition name='disabled_if_in' source="dbCacheQueryEnable">
 			<param>non</param>
 			<target type='variable'>dbQueryCacheLimit</target>

posttemplate/25-bdd-cluster

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+db=$(CreoleGet dbEnable non)
+cluster=$(CreoleGet dbEnableCluster non)
+gstateFile="/var/lib/mysql/grastate.dat"
+
+if [[ ${db} == "oui" ]]
+then
+    if [[ ${cluster} == "oui" ]]
+    then
+        if [[  ! -e ${gstateFile} ]]
+        then
+            galera_new_cluster
+        fi
+    fi
+fi
+
+exit 0