From 930f1b558602131e64425f499113d23238cdb162 Mon Sep 17 00:00:00 2001
From: David Putzolu <dputzolu@gmail.com>
Date: Fri, 22 May 2020 11:11:00 -0700
Subject: [PATCH] Clean up conditionals a bit

---
 roles/ubuntu/tasks/main.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/roles/ubuntu/tasks/main.yml b/roles/ubuntu/tasks/main.yml
index acdc08b..4d1992c 100644
--- a/roles/ubuntu/tasks/main.yml
+++ b/roles/ubuntu/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: Check if cgroups enabled in /boot/firmware/cmdline.txt
+- name: Check if cgroups enabled
   shell: cat /boot/firmware/cmdline.txt | grep cgroup
   register: cgroup_enabled
   when: ansible_distribution == 'Ubuntu'
@@ -8,16 +8,15 @@
   # ignore_errors causes the task not to halt play.
   ignore_errors: true
 
-- name: Enable cgroup via boot commandline if not already present
+- name: Enable cgroup via boot commandline if not already enabled
   lineinfile:
     path: /boot/firmware/cmdline.txt
     backrefs: yes
     regexp: "(.*)$"
     line: '\1 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory'
   when:
-    ( ansible_distribution == 'Ubuntu' )
-      and
-    ( cgroup_enabled.stdout == "" )
+    - ansible_distribution == 'Ubuntu'
+    - cgroup_enabled.stdout == ""
 
 - name: Check if cgroups already running
   shell: cat /proc/cmdline | grep cgroup
@@ -28,10 +27,9 @@
   # ignore_errors causes the task not to halt play.
   ignore_errors: true
 
-- name: Rebooting to enable cgroups if not already running
+- name: Reboot to enable cgroups if not already running
   reboot:
   when:
-    ( ansible_distribution == 'Ubuntu' )
-      and
-    ( cgroup_running.stdout == "" )
+    - ansible_distribution == 'Ubuntu'
+    - cgroup_running.stdout == ""