Updating defaults, moving away from 'omit'

Author: Alex-Welsh

roles/pulp_content_guard/tasks/rbac/rbac.yml

@@ -17,7 +17,7 @@
 - name: Set fact remove_rbac_cg
   set_fact:
     remove_rbac_cg: "{{ (remove_rbac_cg | default([])) + [item.name] }}"
-  when: item.state | default('present') == 'absent'
+  when: item.state is defined and item.state == 'absent'
   with_items: "{{ pulp_content_guard_rbac }}"
 
 - name: Create RBAC content guards
@@ -32,13 +32,13 @@
     status_code: 201
     body:
       name: "{{ item.name }}"
-      description: "{{ item.description | default(omit) }}"
+      description: "{{ item.description | default(None) }}"
     body_format: form-urlencoded
-  loop: "{{ pulp_content_guard_rbac | default([], true) }}"
+  loop: "{{ pulp_content_guard_rbac }}"
   register: result
   when:
     - item.name not in rbaccgnames
-    - item.state | default('present') != 'absent'
+    - item.state is not defined or item.state != 'absent'
   changed_when: result.status == 201
 
 - name: Update existing rbac content guards
@@ -53,13 +53,13 @@
     method: PATCH
     body:
       name: "{{ item.name }}"
-      description: "{{ item.description | default(omit) }}"
+      description: "{{ item.description | default(None) }}"
     body_format: form-urlencoded
-  loop: "{{ pulp_content_guard_rbac | default([], true) }}"
+  loop: "{{ pulp_content_guard_rbac }}"
   register: result
   when:
     - item.name in rbaccgnames
-    - item.state | default('present') != 'absent'
+    - item.state is not defined or item.state != 'absent'
   changed_when:
   # The pulp API currently does not report when a change is made, so we must
   # manually check
@@ -71,7 +71,7 @@
   loop: "{{ pulp_content_guard_rbac | default([], true) }}"
   loop_control:
     loop_var: content_guard
-  when: content_guard.state | default('present') != 'absent'
+  when: not (content_guard.state is defined and content_guard.state == 'absent')
 
 - name: Initialise hrefs
   set_fact:
@@ -92,6 +92,6 @@
     method: DELETE
     status_code: 204
     body_format: form-urlencoded
-  loop: "{{ hrefs | default([]) }}"
+  loop: "{{ hrefs }}"
   register: result
   changed_when: result.status == 204

roles/pulp_group/tasks/main.yml

@@ -13,7 +13,7 @@
 - name: Set fact remove_groups
   set_fact:
     remove_groups: "{{ (remove_groups | default([])) + [item.name] }}"
-  when: item.state | default('present') == 'absent'
+  when: item.state is defined and item.state == 'absent'
   with_items: "{{ pulp_groups }}"
 
 - name: Create groups
@@ -29,11 +29,11 @@
     body:
       name: "{{ item.name }}"
     body_format: form-urlencoded
-  loop: "{{ pulp_groups | default([], true) }}"
+  loop: "{{ pulp_groups }}"
   register: result
   when:
     - item.name not in groupnames
-    - item.state | default('present') != 'absent'
+    - item.state is not defined or item.state != 'absent'
   changed_when: result.status == 201
 
 - name: Initialise hrefs
@@ -55,6 +55,6 @@
     method: DELETE
     status_code: 204
     body_format: form-urlencoded
-  loop: "{{ hrefs | default([]) }}"
+  loop: "{{ hrefs }}"
   register: result
   changed_when: result.status == 204

roles/pulp_user/tasks/main.yml

@@ -13,7 +13,7 @@
 - name: Set fact remove_users
   set_fact:
     remove_users: "{{ (remove_users | default([])) + [item.username] }}"
-  when: item.state | default('present') == 'absent'
+  when: item.state is defined and item.state == 'absent'
   with_items: "{{ pulp_users }}"
 
 - name: Create users
@@ -28,20 +28,20 @@
     status_code: 201
     body:
       username: "{{ item.username }}"
-      password: "{{ item.password | default(omit) }}"
-      first_name: "{{ item.first_name | default(omit) }}"
-      last_name: "{{ item.last_name | default(omit) }}"
-      email: "{{ item.email | default(omit) }}"
-      is_staff: "{{ item.is_staff | default(omit) }}"
-      is_active: "{{ item.is_active | default(omit) }}"
+      password: "{{ item.password | default(None) }}"
+      first_name: "{{ item.first_name | default(None) }}"
+      last_name: "{{ item.last_name | default(None) }}"
+      email: "{{ item.email | default(None) }}"
+      is_staff: "{{ item.is_staff | default(None) }}"
+      is_active: "{{ item.is_active | default(None) }}"
     body_format: form-urlencoded
-  loop: "{{ pulp_users | default([], true) }}"
+  loop: "{{ pulp_users }}"
   loop_control:
     label: "{{ item.username }}"
   register: result
   when:
     - item.username not in usernames
-    - item.state | default('present') != 'absent'
+    - item.state is not defined or item.state != 'absent'
   changed_when: result.status == 201
 
 - name: Update existing users
@@ -56,20 +56,20 @@
     method: PATCH
     body:
       username: "{{ item.username }}"
-      password: "{{ item.password | default(omit) }}"
-      first_name: "{{ item.first_name | default(omit) }}"
-      last_name: "{{ item.last_name | default(omit) }}"
-      email: "{{ item.email | default(omit) }}"
-      is_staff: "{{ item.is_staff | default(omit) }}"
-      is_active: "{{ item.is_active | default(omit) }}"
+      password: "{{ item.password | default(None) }}"
+      first_name: "{{ item.first_name | default(None) }}"
+      last_name: "{{ item.last_name | default(None) }}"
+      email: "{{ item.email | default(None) }}"
+      is_staff: "{{ item.is_staff | default(None) }}"
+      is_active: "{{ item.is_active | default(None) }}"
     body_format: form-urlencoded
-  loop: "{{ pulp_users | default([], true) }}"
+  loop: "{{ pulp_users }}"
   loop_control:
     label: "{{ item.username }}"
   register: result
   when:
     - item.username in usernames
-    - item.state | default('present') != 'absent'
+    - item.state is not defined or item.state != 'absent'
   changed_when:
   # The pulp API currently does not report when a change is made, so we must
   # manually check
@@ -79,8 +79,8 @@
 - name: Add or remove user from group(s)
   include_tasks: user_groups/add_or_remove_users.yml
   # Noop if pulp_users is defined but empty
-  loop: "{{ pulp_users | default([], true) }}"
-  when: (user.state | default('present')) != 'absent'
+  loop: "{{ pulp_users }}"
+  when: item.state is not defined or item.state != 'absent'
   loop_control:
     loop_var: user
 
@@ -103,6 +103,6 @@
     method: DELETE
     status_code: 204
     body_format: form-urlencoded
-  loop: "{{ hrefs | default([]) }}"
+  loop: "{{ hrefs }}"
   register: result
   changed_when: result.status == 204