From c1ff249d3e7b0e6eb7866cf2b61a815ff1ff36ca Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Thu, 12 Apr 2018 10:38:53 +0200
Subject: [PATCH] Adding mariadb service management

---
 creolefuncs/mariadb.py  |  4 ++--
 dicos/25_bdd_server.xml | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/creolefuncs/mariadb.py b/creolefuncs/mariadb.py
index 688e696..0351e9c 100644
--- a/creolefuncs/mariadb.py
+++ b/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"
 
diff --git a/dicos/25_bdd_server.xml b/dicos/25_bdd_server.xml
index 8e966ff..5b16317 100644
--- a/dicos/25_bdd_server.xml
+++ b/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>