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

posttemplate/25-bdd-cluster

@@ -8,12 +8,9 @@ gstateFile="/var/lib/mysql/grastate.dat"
 if [[ ${db} == "oui" ]]
 then
     if [[ ${cluster} == "oui" ]]
-    then
-        if [[  ! -e ${gstateFile} ]]
     then
 		[[ ${role} == "Leader"  ]] && galera_new_cluster
     fi
 fi
-fi
 
 exit 0

preservice/25-bdd-init

@@ -4,12 +4,14 @@
 # and secure MariaDB installation
 #
 
-ROLE=$(CreoleGet dbClusterPosition)
+ROLE=$(CreoleGet dbClusterPosition 'Leader')
 SECURE_CMD="mysql_secure_installation"
 PASSWORD=$(pwgen -1 10)
 passwd="/usr/share/eole/sbin/mariadbPwd"
 logfile="/var/log/eole/maria-init.log"
 
+if [[ ${ROLE} == "Leader" ]]
+then
    ${passwd} ${PASSWORD}
 
    # Run secure installation script
@@ -22,3 +24,6 @@ y
 y
 y
 __EOF__
+else
+   exit 0
+fi

scripts/mariadbPwd

@@ -6,6 +6,10 @@
 cmd="mysql"
 options='--defaults-file=/etc/mysql/debian.cnf'
 
+role=$(CreoleGet dbClusterRole 'Leader')
+
+if [[ ${role} == "Leader"]]
+then
    if [[ -z ${1} ]]
    then
       read -s -p "New Password : " password
@@ -18,3 +22,7 @@ sql="FLUSH PRIVILEGES; ALTER USER 'root'@'localhost' IDENTIFIED BY '${password}'
 
    ${cmd} ${options} -e "${sql}"
    exit $?
+else
+   echo "This command don't work in a MariaDB Cluster Node, try in the Leader"
+   exit 3
+fi