Make stylistic improvements.

dev.playbook.yml

@@ -3,6 +3,7 @@
 - hosts: lockss
   become: true
   vars:
+    minimum_memory_mb: 4096
     lockss_db_password: pass
     lockss_ui_password: pass
     lockss_hostname: "{{ hostname }}"
@@ -10,8 +11,6 @@
     lockss_external_ipaddr: "{{ external_ip }}"
     lockss_access_subnet: 0.0.0.0/0
     lockss_admin_email: root@localhost
-    minimum_memory_mb: 4096
-
   roles:
     - system-update
     - minimum_memory

roles/lockss/tasks/main.yml

@@ -23,8 +23,6 @@
   command:
     cmd: docker info -f {% raw %}'{{.Driver}}'{% endraw %}
   check_mode: false
-  ignore_errors: true
-  no_log: true
   changed_when: false
   register: r
 
@@ -86,6 +84,7 @@
     dest: /usr/src/lockss
     version: "{{ lockss_git_version }}"
     depth: 1
+  become: true
   become_user: lockss
 
 - name: Install ifconfig.
@@ -164,6 +163,7 @@
   command:
     cmd: scripts/generate-lockss
     chdir: /usr/src/lockss
+  become: true
   become_user: lockss
 
 # FIXME: LOCKSS's scripts are yucky. Should we care?
@@ -171,16 +171,19 @@
   command:
     cmd: scripts/shutdown-lockss
     chdir: /usr/src/lockss
+  become: true
   become_user: lockss
 
 - name: Assemble LOCKSS containers.
   command:
     cmd: scripts/assemble-lockss
     chdir: /usr/src/lockss
+  become: true
   become_user: lockss
 
 - name: Deploy LOCKSS containers.
   command:
     cmd: scripts/deploy-lockss
     chdir: /usr/src/lockss
+  become: true
   become_user: lockss

roles/minimum_memory/tasks/main.yml

@@ -7,13 +7,13 @@
         cmd: swapon --show=name --noheadings |
              grep -qFx -- {{ swapfile_name | quote }}
       check_mode: false
-      ignore_errors: true
-      no_log: true
+      failed_when: r.rc not in [0, 1]
       changed_when: false
       register: r
 
     - name: Disable swapping to swapfile.
-      command: swapoff -- {{ swapfile_name | quote }}
+      command:
+        cmd: swapoff -- {{ swapfile_name | quote }}
       when: not r.rc
 
     - name: "Update fact: ansible_swaptotal_mb."
@@ -21,10 +21,11 @@
         filter: ansible_swaptotal_mb
 
     - name: Create swapfile.
-      # The swapfile's header takes up 4 KiB.
-      command: dd if=/dev/zero of={{ swapfile_name | quote }} bs=1024
-               count={{ (minimum_memory_mb - ansible_memtotal_mb -
-                        ansible_swaptotal_mb) * 1024 + 4 }}
+      command:
+        # The swapfile's header takes up 4 KiB.
+        cmd: dd if=/dev/zero of={{ swapfile_name | quote }} bs=1024
+             count={{ (minimum_memory_mb - ansible_memtotal_mb -
+                      ansible_swaptotal_mb) * 1024 + 4 }}
 
     - name: Set swapfile permissions.
       file:
@@ -33,7 +34,8 @@
         mode: 0600
 
     - name: Format swapfile.
-      command: mkswap -- {{ swapfile_name | quote }}
+      command:
+        cmd: mkswap -- {{ swapfile_name | quote }}
 
     - name: Add swapfile to fstab.
       mount:
@@ -43,7 +45,8 @@
         state: present
 
     - name: Enable swapping for file.
-      command: swapon -- {{ swapfile_name | quote }}
+      command:
+        cmd: swapon -- {{ swapfile_name | quote }}
 
     - name: "Update fact: ansible_swaptotal_mb."
       setup: