From d04a86aedd06f26ca00dc6dc5072a243622b5570 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Wed, 9 May 2018 14:13:18 +0200
Subject: [PATCH 1/2] We need to disable Tunning family

---
 dicos/25_bdd_server.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dicos/25_bdd_server.xml b/dicos/25_bdd_server.xml
index 270f704..a23402f 100644
--- a/dicos/25_bdd_server.xml
+++ b/dicos/25_bdd_server.xml
@@ -162,8 +162,9 @@
 
 		<condition name='disabled_if_in' source="dbEnable">
 			<param>non</param>
-			<target type='family'>Database Cluster</target>
 			<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='filelist'>dbTunning</target>
 			<target type='filelist'>dbMariaDB</target>

From 8369cf27da222fcc8a94e62fe7503e752c78dd23 Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Wed, 9 May 2018 14:25:25 +0200
Subject: [PATCH 2/2] Don't run script if db is disabled

---
 preservice/25-bdd-init | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/preservice/25-bdd-init b/preservice/25-bdd-init
index cc88378..964502b 100644
--- a/preservice/25-bdd-init
+++ b/preservice/25-bdd-init
@@ -4,6 +4,8 @@
 # and secure MariaDB installation
 #
 
+[[ "$(CreoleGet dbEnable)" == "non" ]] && exit 0
+
 ROLE=$(CreoleGet dbClusterPosition 'Leader')
 SECURE_CMD="mysql_secure_installation"
 PASSWORD=$(pwgen -1 10)