From 70597f401b4ef82640b3429d1a473a10bbb423a7 Mon Sep 17 00:00:00 2001 From: Stefan Wienert Date: Fri, 28 Feb 2014 20:32:51 +0100 Subject: [PATCH 1/2] make vm-overcommit optional --- defaults/main.yml | 1 + tasks/main.yml | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a3e10a3..9c07670 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -21,5 +21,6 @@ redis_appendfsync: everysec redis_master_ip: 1.1.1.1 redis_master_port: 6379 redis_master_auth: None +redis_vm_overcommit: true diff --git a/tasks/main.yml b/tasks/main.yml index 5435938..d6eb93d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -3,28 +3,29 @@ - name: Add the OS specific varibles include_vars: "{{ ansible_os_family }}.yml" -- name: Install the epel packages +- name: Install the epel packages yum: name=http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm state=present when: ansible_os_family == "RedHat" -- name: Install the Redis packages +- name: Install the Redis packages yum: name={{ item }} state=present with_items: redis_redhat_pkg when: ansible_os_family == "RedHat" -- name: Install the Redis packages +- name: Install the Redis packages apt: name={{ item }} state=present update_cache=yes with_items: redis_ubuntu_pkg environment: env when: ansible_os_family == "Debian" -- name: Copy the redis configuration file +- name: Copy the redis configuration file template: src=redis.conf.j2 dest={{ redis_conf_dest }} - notify: - - restart redis + notify: + - restart redis -- name: Set the kernel paramter for vm overcommit +- name: Set the kernel paramter for vm overcommit sysctl: name=vm.overcommit_memory value=1 state=present + when: redis_vm_overcommit - name: start the redis service service: name={{ redis_service }} state=started enabled=yes From 238ed14bd54bec4affaac53e5b6eee82608b0732 Mon Sep 17 00:00:00 2001 From: Stefan Wienert Date: Fri, 28 Feb 2014 20:39:39 +0100 Subject: [PATCH 2/2] not fixed whitespace to make the pull request tidy --- tasks/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index d6eb93d..a46c483 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -3,27 +3,27 @@ - name: Add the OS specific varibles include_vars: "{{ ansible_os_family }}.yml" -- name: Install the epel packages +- name: Install the epel packages yum: name=http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm state=present when: ansible_os_family == "RedHat" -- name: Install the Redis packages +- name: Install the Redis packages yum: name={{ item }} state=present with_items: redis_redhat_pkg when: ansible_os_family == "RedHat" -- name: Install the Redis packages +- name: Install the Redis packages apt: name={{ item }} state=present update_cache=yes with_items: redis_ubuntu_pkg environment: env when: ansible_os_family == "Debian" -- name: Copy the redis configuration file +- name: Copy the redis configuration file template: src=redis.conf.j2 dest={{ redis_conf_dest }} - notify: - - restart redis + notify: + - restart redis -- name: Set the kernel paramter for vm overcommit +- name: Set the kernel paramter for vm overcommit sysctl: name=vm.overcommit_memory value=1 state=present when: redis_vm_overcommit