From 2f3ee1c3d3f843a3de4218a871b3cc4b8033f216 Mon Sep 17 00:00:00 2001 From: Sujay Mansingh Date: Wed, 26 Mar 2014 14:55:39 +0000 Subject: [PATCH 1/3] Allow option to not change autocommit setting This way we can install redis on a container (where it might not be possible to change kernel settings). --- defaults/main.yml | 5 ++++- tasks/main.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index a3e10a3..1c0169e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -22,4 +22,7 @@ redis_master_ip: 1.1.1.1 redis_master_port: 6379 redis_master_auth: None - +# Set this to true if you don't want to change the overcommit kernel setting. +# (E.g. when you're using a container and you can't change kernel settings.) +# +redis_no_vm_overcommit: false diff --git a/tasks/main.yml b/tasks/main.yml index 5435938..8eaa036 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,6 +25,7 @@ - name: Set the kernel paramter for vm overcommit sysctl: name=vm.overcommit_memory value=1 state=present + when: redis_no_vm_overcommit == false - name: start the redis service service: name={{ redis_service }} state=started enabled=yes From 474561bfc3fd89a969bd30191f18acd45a960e46 Mon Sep 17 00:00:00 2001 From: Sujay Mansingh Date: Wed, 26 Mar 2014 15:02:06 +0000 Subject: [PATCH 2/3] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 4ad8d6d..e42af20 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,10 @@ them are as follows. See the documentation for Redis for details: redis_master_port: 6379 # master port redis_master_auth: None # master auth + # This isn't a redis setting, but if set to true, then the role won't try to + # change the kernel setting (useful for containers). + redis_no_vm_overcommit: false + Examples -------- From 64e3f13d62f3df7e4bb0320eff03bcb6ffda94ed Mon Sep 17 00:00:00 2001 From: Sujay Mansingh Date: Wed, 26 Mar 2014 15:02:41 +0000 Subject: [PATCH 3/3] Fix typo in name of task --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 8eaa036..ebb37a8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,7 +23,7 @@ notify: - restart redis -- name: Set the kernel paramter for vm overcommit +- name: Set the kernel parameter for vm overcommit sysctl: name=vm.overcommit_memory value=1 state=present when: redis_no_vm_overcommit == false