Updated to support optional firewalling and version number.

riak/group_vars/all

@@ -1,5 +1,7 @@
 ---
+firewall: True
 riak:
+  version: 1.3.1
   iface: eth1
   handoff_port: 8099
   http_port: 8098

riak/roles/riak/common/templates/etc_riak_vm.args.j2

@@ -17,7 +17,7 @@
 +W w
 
 
-{% if ansible_processor_cores == 'NA' %}
+{% if ansible_processor_cores == 'NA' or ansible_processor_cores == 1 %}
 -smp enable
 {% endif %}
 

riak/roles/riak/redhat/tasks/main.yml

@@ -1,8 +1,9 @@
 ---
 - name: install riak
-  yum: name=riak state=present
+  yum: name=riak-{{ riak.version }} state=present
 
 - name: configure iptables
   template: src=iptables.j2 dest=/etc/sysconfig/iptables.riak owner=root group=root
   notify:
-  - lokkit
+  - lokkit
+  when: firewall is defined

riak/roles/riak/ubuntu/tasks/main.yml

@@ -1,12 +1,14 @@
 ---
 - name: install riak
-  apt: pkg=riak
+  apt: pkg=riak-{{ riak.version }}
 
 - name: set the riak ulimit
   copy: src=etc_default_riak_ulimit dest=/etc/default/riak
 
 - name: configure iptables
   template: src=iptables.j2 dest=/etc/ufw/applications.d/riak owner=root group=root mode=0644
+  when: firewall is defined
 
 - name: update fw
   ufw: enable=yes allow=riak
+  when: firewall is defined