Merge branch 'develop' into dist/eole/2.7.0/develop

This commit is contained in:
vincent 2019-03-04 17:36:07 +01:00
commit 75d8c0eb6a
1 changed files with 4 additions and 3 deletions

View File

@ -50,9 +50,7 @@
<!-- Instance Secondaire --> <!-- Instance Secondaire -->
<variable name='redisSlaveInstanceName' type='string' description="Nom de l'instance secondaire"/> <variable name='redisSlaveInstanceName' type='string' description="Nom de l'instance secondaire"/>
<variable name='redisSlaveInstanceMaster' type='string' description="Nom du noeud a répliquer sur l'instance secondaire"/> <variable name='redisSlaveInstanceMaster' type='string' description="Nom du noeud a répliquer sur l'instance secondaire"/>
<variable name='redisMasterIPSlave' type='ip' description="IP du service Redis master"> <variable name='redisMasterIPSlave' type='domain' description="Nom de domaine du service Redis master" mandatory="True"/>
<value>127.0.0.1</value>
</variable>
<variable name='redisMasterPortSlave' type='number' description="Port d'écoute du service Redis master"> <variable name='redisMasterPortSlave' type='number' description="Port d'écoute du service Redis master">
<value>6379</value> <value>6379</value>
</variable> </variable>
@ -154,6 +152,7 @@
<condition name='disabled_if_in' source='redisMode'> <condition name='disabled_if_in' source='redisMode'>
<param>Local</param> <param>Local</param>
<target type='variable'>redisRole</target> <target type='variable'>redisRole</target>
<target type='variable'>redisInstanceName</target>
<target type='variable'>redisSlaveInstance</target> <target type='variable'>redisSlaveInstance</target>
<target type='filelist'>redisCl</target> <target type='filelist'>redisCl</target>
<target type='variable'>redisClPort</target> <target type='variable'>redisClPort</target>
@ -162,6 +161,7 @@
<condition name='disabled_if_in' source='redisMode'> <condition name='disabled_if_in' source='redisMode'>
<param>Local avec slave distant</param> <param>Local avec slave distant</param>
<target type='variable'>redisRole</target> <target type='variable'>redisRole</target>
<target type='variable'>redisInstanceName</target>
<target type='variable'>redisSlaveInstanceName</target> <target type='variable'>redisSlaveInstanceName</target>
<target type='variable'>redisSlaveInstanceMaster</target> <target type='variable'>redisSlaveInstanceMaster</target>
<target type='variable'>redisClPortSlave</target> <target type='variable'>redisClPortSlave</target>
@ -177,6 +177,7 @@
<condition name='disabled_if_in' source='redisRole'> <condition name='disabled_if_in' source='redisRole'>
<param>Node</param> <param>Node</param>
<target type='filelist'>redisCl</target> <target type='filelist'>redisCl</target>
<target type='variable'>redisInstanceName</target>
<target type='variable'>rdClMember</target> <target type='variable'>rdClMember</target>
<target type='variable'>rdClMemberIP</target> <target type='variable'>rdClMemberIP</target>
<target type='variable'>rdClMemberPort</target> <target type='variable'>rdClMemberPort</target>