Merge branch 'zram-generator-fixes' into 'master'

Remove zram size limit and disable zswap when using zram

See merge request !458

roles/common/files/zram-generator.conf

 [zram0]
+max-zram-size = none

roles/common/handlers/main.yml

@@ -19,5 +19,5 @@
 - name: restart syslog-ng
   service: name=syslog-ng@default state=restarted
 
-- name: restart swap.target
-  service: name=swap.target state=restarted daemon_reload=yes
+- name: restart systemd-zram-setup@zram0
+  service: name=systemd-zram-setup@zram0 state=restarted daemon_reload=yes

roles/common/tasks/main.yml

@@ -141,9 +141,18 @@
 - name: install zram-generator config for zram
   copy: src=zram-generator.conf dest=/etc/systemd/zram-generator.conf owner=root group=root mode=0644
   notify:
-    - restart swap.target
+    - restart systemd-zram-setup@zram0
   when: enable_zram_swap
 
+- name: disable zswap to prevent conflict with zram
+  copy: content="w- /sys/module/zswap/parameters/enabled - - - - N" dest=/etc/tmpfiles.d/zram.conf
+  register: zramtmpfiles
+  when: enable_zram_swap
+
+- name: use tmpfiles.d/zram.conf
+  command: systemd-tmpfiles --create
+  when: zramtmpfiles.changed
+
 - name: start systemd-oomd
   service: name=systemd-oomd state=started enabled=yes