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

dicos/25_bdd_server.xml

@@ -95,8 +95,8 @@
 		</family>
 
 		<family name="Database Cluster">
+			<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"/>
 
@@ -137,6 +137,10 @@
 			<param>['Default','Custom']</param>
 		</check>
 
+		<check name='valid_enum' target='dbClusterPosition'>
+			<param>['Leader','Node']</param>
+		</check>
+
 		<group master='accName'>
 			<slave>accLimits</slave>
 			<slave>accLimitTarget</slave>

pretemplate/25-bdd-init

@@ -12,12 +12,14 @@ function genPasswordToFile()
 	chmod 600 ${file}
 }
 
+ROLE=$(CreoleGet dbClusterPosition)
 WRITERFILE="/root/.bddadm"
 SECURE_CMD="mysql_secure_installation"
 
-
+[[ ${ROLE} == "Node" ]] && exit 0
 [[ -e ${WRITERFILE} ]] && exit 0
 
+
 genPasswordToFile ${WRITERFILE}
 
 pass=$(< ${WRITERFILE})