Merge pull request #10 from swenson/container-fix

Ignore errors if sysctl fails; needed for running in restricted env
basho-labs · Aug 11, 2014 · 22316c8 · 22316c8
2 parents 8cae1b1 + 3858271
commit 22316c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -1,7 +1,4 @@
 ---
-- name: update sysctl
-  command: sysctl -e -p /etc/sysctl.d/riak.conf
-
 - name: source rclocal
   command: /bin/bash /etc/rc.local
 

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -4,11 +4,11 @@
 
 - name: copy custom riak package
   copy: src={{ riak_custom_package }} dest=/tmp
-  when: riak_custom_package != False and riak_custom_package.find('http') == -1 
+  when: riak_custom_package != False and riak_custom_package.find('http') == -1
 
 - name: copy custom riak package from remote
   action: get_url url={{ riak_custom_package }} dest=/tmp/
-  when: riak_custom_package != False and riak_custom_package.find('http') != -1 
+  when: riak_custom_package != False and riak_custom_package.find('http') != -1
 
 - name: set riak packagename
   set_fact: riak_package=/tmp/{{ riak_custom_package|basename }} state=present
@@ -43,7 +43,9 @@
 
 - name: configure sysctl
   template: src=etc_sysctl.d_riak.conf.j2 dest=/etc/sysctl.d/riak.conf owner=root group=root mode=0644
-  notify: update sysctl
+  notify:
+    - check proc writeable
+    - update sysctl
 
 - name: copying custom beams
   copy: src={{ item }} dest="{{ riak_patch_dir }}/"