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

dicos/90_redis.xml

@@ -3,6 +3,7 @@
     <files>
         <!-- System configuration -->
         <file filelist='redis' name='/etc/redis/redis.conf' mkdir='True' rm='True'/>
+        <file filelist='redisCl' name='/etc/redis/cluster.conf' source='redis-cluster.conf' mkdir='True' rm='True'/>
         <service servicelist="svredis">redis-server</service>
         <service_access service='redis-server'>
             <port service_accesslist='saRedis' protocol='tcp' port_type='SymLinkOption'>redisPort</port>
@@ -70,6 +71,7 @@
             <target type='variable'>redisMasterIP</target>
             <target type='variable'>redisMasterPort</target>
             <target type='variable'>redisMasterPassword</target>
+			<target type='filelist'>redisCl</target>
         </condition>
 
         <condition name='disabled_if_in' source='redisRole'>
@@ -78,6 +80,11 @@
             <target type='variable'>redisMasterPort</target>
         </condition>
 
+        <condition name='disabled_if_in' source='redisRole'>
+            <param>Node</param>
+            <target type='filelist'>redisCl</target>
+        </condition>
+
 		<condition name='disabled_if_in' source='rdClMemberRole'>
 			<param>master</param>
 			<target type='variable'>rdClMemberMaster</target>

tmpl/redis-cluster.conf

@@ -0,0 +1,4 @@
+%if %%getVar('active_redis','non') == 'oui' and %%getVar('redisRole','Node') == 'Leader'
+%for %%node in %%getvar('rdMemberIP',[])
+%%{node}:%%{node.rdClMemberPort}:%%{node.rdClMemberRole}:%%{node.rdClMemberMaster}
+%end if