Cadoles
/
eole-mariadb
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Philippe Caseiro 2018-04-12 12:14:23 +02:00
parent 8cf9168763 a9da618e21
commit 1fb5fd21b8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dicos/25_bdd_server.xml
View File

@ -95,8 +95,8 @@
</family> </family>
<family name="Database Cluster"> <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"/> <variable name='ifDBCluster' type='string' description="Interface réseau dédiée à la grappe BDD"/>
<!-- FIXME : Fill this variable with nom_machine --> <!-- FIXME : Fill this variable with nom_machine -->
<variable name='nodeName' type='string' description="Nom du noeud local"/> <variable name='nodeName' type='string' description="Nom du noeud local"/>
@ -137,6 +137,10 @@
<param>['Default','Custom']</param> <param>['Default','Custom']</param>
</check> </check>
<check name='valid_enum' target='dbClusterPosition'>
<param>['Leader','Node']</param>
</check>
<group master='accName'> <group master='accName'>
<slave>accLimits</slave> <slave>accLimits</slave>
<slave>accLimitTarget</slave> <slave>accLimitTarget</slave>

4
pretemplate/25-bdd-init
View File

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