Cadoles
/
eole-redis
11
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

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

This commit is contained in:
Philippe Caseiro 2018-05-11 15:27:00 +02:00
parent 146206e353 325e51b0cf
commit 14a2bdd6dd
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dicos/90_redis.xml
View File

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

4
tmpl/redis-cluster.conf Normal file
View File

@ -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