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

This commit is contained in:
Philippe Caseiro 2018-05-11 15:14:34 +02:00
commit 146206e353
1 changed files with 8 additions and 1 deletions

View File

@ -44,7 +44,8 @@
<variable name='redisMasterIP' type='ip' description="Adresse IP du Leader Redis"/> <variable name='redisMasterIP' type='ip' description="Adresse IP du Leader Redis"/>
<variable name='redisMasterPort' type='number' description="Port d'écoute du Leader Redis"/> <variable name='redisMasterPort' type='number' description="Port d'écoute du Leader Redis"/>
<variable name='redisMasterPassword' type='string' description="Passphrase d'accès à la grappe Redis"/> <variable name='redisMasterPassword' type='string' description="Passphrase d'accès à la grappe Redis"/>
<variable name='rdClMemberIP' type='ip' description="Adresse IP du Noeud"/> <variable name='rdClMemberIP' type='ip' description="Adresse IP du noeud" multi='True'/>
<variable name='rdClMemberPort' type='number' description="Port d'écoute du noeud" multi='True'/>
<variable name='rdClMemberRole' type='ip' description="Rôle du membre"/> <variable name='rdClMemberRole' type='ip' description="Rôle du membre"/>
<variable name='rdClMemberMaster' type='ip' description="Noeud source des données pour ce membre"/> <variable name='rdClMemberMaster' type='ip' description="Noeud source des données pour ce membre"/>
</family> </family>
@ -85,6 +86,12 @@
<group master='rdClIP'> <group master='rdClIP'>
<slave>rdClmask</slave> <slave>rdClmask</slave>
</group> </group>
<group master='rdClMemberIP'>
<slave>rdClMemberPort</slave>
<slave>rdClMemberRole</slave>
<slave>rdClMemberMaster</slave>
</group>
<check name="valid_enum" target="redisRole"> <check name="valid_enum" target="redisRole">
<param>['Leader','Node']</param> <param>['Leader','Node']</param>
</check> </check>