Feature/redis 2.6 fixes

README.md

@@ -17,28 +17,43 @@ Role Variables
 The variables that can be passed to this role and a brief description about
 them are as follows. See the documentation for Redis for details:
 
-	redis_bind_address                # The network address for redis to bind to 
-        redis_port: 6379                  # Port for redis server
-	redis_syslog_enabled: "yes"       # enable_syslog
-	redis_databases: 16               # Set number of databases
-	redis_database_save_times:        # Save the DB on disk (seconds changes)
+	redis_pidfile: /var/run/redis.pid 		# PID File
+	redis_bind_address: "0.0.0.0" 			# The network address for redis to bind to
+	redis_port: 6379 						# Port for the Redis server
+	redis_unixsocket: null					# (Optional) Socket file
+	redis_unixsocketperm: null				# (Optional) Socket permissions
+	redis_syslog_enabled: "yes"				# enable_syslog
+	redis_databases: 16 					# Set number of databases
+	redis_database_save_times:          	# Save the DB on disk (seconds changes)
 	  - [900, 1]
 	  - [300, 10]
 	  - [60, 10000]
-	redis_dbfilename: dump.rdb        # Filename for the db
-	redis_db_dir: /var/lib/redis      # DB directory
-	redis_role: master                # The role for this redis deployment (master/slave)
-	redis_requirepass: false          # If password is required for querying
-	redis_pass: None                  # Password if require_pass is enabled
-	redis_max_clients: 128
-	redis_max_memory: 512mb
-	redis_maxmemory_policy: volatile-lru
-	redis_appendfsync: everysec       # How often to sync the filesystem
-
-	# If redis_role is "slave", set these values too
-	redis_master_ip: 1.1.1.1          # The master's IP
-	redis_master_port: 6379           # master port
-	redis_master_auth: None           # master auth
+	redis_dbfilename: dump.rdb 				# Filename for the db
+	redis_db_dir: /var/lib/redis  			# DB Directory
+	redis_role: master 						# Role for redis deployment (master/slave)
+	redis_requirepass: false 				# If a password is required
+	redis_pass: None  						# Password is requirepass is enabled
+	redis_max_clients: 10000  				# Maximum number of clients allowed to connect
+	redis_maxmemory: null					# (Optional) Maximum memory that Redis can use
+	redis_maxmemory_policy: volatile-lru	
+	redis_appendfsync: everysec
+	redis_timeout: 0
+	redis_loglevel: notice					# Loglevel
+	redis_logfile: /var/log/redis.log 		# File to log to
+	redis_hz: 10
+	redis_tcp_keepalive: 0
+	redis_syslog_ident: redis
+	redis_disable_tcp_nodelay: no
+	redis_appendonly: no
+	redis_appendfilename: appendonly.aof
+
+	If role is slave set these values too
+	redis_master_ip: 1.1.1.1
+	redis_master_port: 6379
+	redis_master_auth: None
+	redis_slave_serve_stale_data: yes
+	redis_slave_read_only: yes
+	redis_slave_priority: 100
 
 Examples
 --------

defaults/main.yml

@@ -1,6 +1,10 @@
 ---
 
+redis_pidfile: /var/run/redis.pid
 redis_bind_address: "0.0.0.0"
+redis_unixsocket: null
+redis_unixsocketperm: null
+redis_max_memory: null
 redis_port: 6379
 redis_syslog_enabled: "yes"
 redis_databases: 16
@@ -12,14 +16,25 @@ redis_dbfilename: dump.rdb
 redis_db_dir: /var/lib/redis
 redis_role: master
 redis_requirepass: false
-redis_pass: None
-redis_max_clients: 128
-redis_max_memory: 512mb
+redis_pass: null
+redis_max_clients: 10000
 redis_maxmemory_policy: volatile-lru
 redis_appendfsync: everysec
+redis_timeout: 0
+redis_loglevel: notice
+redis_logfile: /var/log/redis/redis.log
+redis_hz: 10
+redis_tcp_keepalive: 0
+redis_syslog_ident: redis
 #If role is slave set these values too
 redis_master_ip: 1.1.1.1
 redis_master_port: 6379
-redis_master_auth: None
+redis_master_auth: null
+redis_slave_serve_stale_data: "yes"
+redis_slave_read_only: "yes"
+redis_slave_priority: 100
 
+redis_disable_tcp_nodelay: "no"
 
+redis_appendonly: "no"
+redis_appendfilename: appendonly.aof