From 1ddc6ffb2f79b97b830fa4e2331a4843a93c08cb Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Fri, 11 May 2018 15:03:44 +0200
Subject: [PATCH] Gestion des noeuds membres

---
 dicos/90_redis.xml | 14 +++++++++++++-
 tmpl/redis.conf    |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dicos/90_redis.xml b/dicos/90_redis.xml
index 06808a3..c5f74e9 100644
--- a/dicos/90_redis.xml
+++ b/dicos/90_redis.xml
@@ -9,6 +9,7 @@
         </service_access>
         <service_restriction service='ead_web'>
                <ip interface='auto' netmask='rdClmask' netmask_type='SymLinkOption' ip_type='SymLinkOption'>rdClIP</ip>
+               <ip interface='auto' netmask='255.255.255.255' ip_type='SymLinkOption'>redisMasterIP</ip>
         </service_restriction>
     </files>
     <variables>
@@ -36,7 +37,6 @@
             <variable name='rdClIP' type='ip' description="Adresse IP réseau autorisée a utiliser le service Redis" multi='True'/>
             <variable name='rdClmask' type='ip' description="Masque de sous réseau"/>
 
-
             <!-- Cluster configration Part -->
             <variable name='redisRole' type='string' description="Role du serveur Redis">
                 <value>Leader</value>
@@ -44,10 +44,14 @@
             <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='redisMasterPassword' type='string' description="Passphrase d'accès à la grappe Redis"/>
+			<variable name='rdClMemberIP' type='ip' description="Adresse IP du Noeud"/>
+			<variable name='rdClMemberRole' type='ip' description="Rôle du membre"/>
+			<variable name='rdClMemberMaster' type='ip' description="Noeud source des données pour ce membre"/>
         </family>
         <separators>
             <separator name='rdClIP'>Autorisation d'accès au service Redis</separator>
             <separator name='redisRole'>Grappe Redis</separator>
+            <separator name='rdClMemberIP'>Serveurs membres de la grappe Redis</separator>
         </separators>
     </variables>
     <constraints>
@@ -73,6 +77,11 @@
             <target type='variable'>redisMasterPort</target>
         </condition>
 
+		<condition name='disabled_if_in' source='rdClMemberRole'>
+			<param>master</param>
+			<target type='variable'>rdClMemberMaster</target>
+		</condition>
+
         <group master='rdClIP'>
             <slave>rdClmask</slave>
         </group>
@@ -82,6 +91,9 @@
         <check name="valid_enum" target="redisMode">
             <param>['Local','Cluster']</param>
         </check>
+        <check name="valid_enum" target="rdClMemberRole">
+            <param>['master','slave']</param>
+        </check>
         <check name="valid_enum" target="redisMemoryPolicy">
             <param>['noeviction', 'allkeys-lru','volatile-lru','volatile-random', 'allkeys-random','volatile-ttl']</param>
         </check>
diff --git a/tmpl/redis.conf b/tmpl/redis.conf
index 14bbc83..9cff55e 100644
--- a/tmpl/redis.conf
+++ b/tmpl/redis.conf
@@ -707,7 +707,7 @@ aof-load-truncated yes
 # Set it to 0 or a negative value for unlimited execution without warnings.
 lua-time-limit 5000
 
-%if %%getVar('redisMode','Local') == "Cluster"
+%if %%getVar('redisMode','Local') == "Cluster" and %%getVar('redisRole','Node') == 'Leader'
 ################################ REDIS CLUSTER  ###############################
 #
 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++