Always become user we are managing

Author: mhjacks

tasks/get_systemd_units_info.yml

@@ -8,8 +8,7 @@
   systemd_units:
     user: "{{ __systemd_units_info.key }}"
     user_facts: "{{ ansible_facts['systemd_units_user'] | d({}) }}"
-  become: "{{ __systemd_units_info.key != 'root' }}"
-  become_user: "{{ __systemd_units_info.key if __systemd_units_info.key != 'root'
-    else omit }}"
+  become: true
+  become_user: "{{ __systemd_units_info.key }}"
   environment:
     XDG_RUNTIME_DIR: "{{ __systemd_units_info.value['xdg_dir'] }}"

tasks/main.yml

@@ -114,8 +114,8 @@
     daemon_reload: true
     scope: "{{ 'system' if item == 'root' else 'user' }}"
   loop: "{{ __users_with_changes }}"
-  become: "{{ item != 'root' }}"
-  become_user: "{{ item if item != 'root' else omit }}"
+  become: true
+  become_user: "{{ item }}"
   environment:
     XDG_RUNTIME_DIR: "{{ __systemd_user_info[item]['xdg_dir'] }}"
   vars:

tasks/manage_units.yml

@@ -33,7 +33,7 @@
         masked: "{{ __systemd_masked | bool if __systemd_masked | length > 0 else omit }}"
         scope: "{{ 'system' if item.user == 'root' else 'user' }}"
       loop: "{{ __systemd_dict_list }}"
-      become: "{{ item.user != 'root' }}"
-      become_user: "{{ item.user if item.user != 'root' else omit }}"
+      become: true
+      become_user: "{{ item.user }}"
       environment:
         XDG_RUNTIME_DIR: "{{ item.xdg_dir }}"