improve ansible workflow for more than one devices

DO1JLR · Apr 24, 2019 · 5f57bce · 5f57bce
1 parent e853e36
commit 5f57bce
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/host_vars/desk_minni.yml b/host_vars/desk_minni.yml
@@ -19,3 +19,5 @@ accounts:
   - lilian
 
 akku_user: "lilian"
+
+copy_to_user: "{{ akku_user }}"
diff --git a/host_vars/l460.yml b/host_vars/l460.yml
@@ -17,3 +17,7 @@ admins_ssh_root_prefix:
 
 accounts:
   - lilian
+
+akku_user: "lilian"
+
+copy_to_user: "{{ akku_user }}"
diff --git a/host_vars/t460p.yml b/host_vars/t460p.yml
@@ -15,3 +15,5 @@ accounts:
   - l3d
 
 akku_user: "l3d"
+
+copy_to_user: "{{ akku_user }}"
diff --git a/roles/copy_files/defaults/main.yml b/roles/copy_files/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+copy_to_user: "{{ ansible_user_id }}"
diff --git a/roles/copy_files/tasks/main.yml b/roles/copy_files/tasks/main.yml
@@ -5,7 +5,7 @@
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
   with_items:
-    - { src: 'files/background.png', dest: "/home/{{ user }}/.config/background.png" }
-    - { src: 'files/lockscreen.png', dest: '/home/{{ user }}/.config/lockscreen.png' }
-    - { src: 'files/xinitrc', dest: '/home/{{ user }}/.xinitrc' }
+    - { src: 'files/background.png', dest: "/home/{{ copy_to_user }}/.config/background.png" }
+    - { src: 'files/lockscreen.png', dest: '/home/{{ copy_to_user }}/.config/lockscreen.png' }
+    - { src: 'files/xinitrc', dest: '/home/{{ copy_to_user }}/.xinitrc' }
 
diff --git a/roles/i3wm b/roles/i3wm
diff --git a/roles/networkmanager/tasks/main.yml b/roles/networkmanager/tasks/main.yml
@@ -17,14 +17,14 @@
   dnf:
     name: NetworkManager
     state: present
-  when: ansible_distribution == Fedora
+  when: ansible_distribution == 'Fedora'
 
 - name: install NetworkManager
   become: yes
   apt:
     name: networkmanager
     state: present
-  when: ansible_os_family == Debian
+  when: ansible_os_family == 'Debian'
 
 - name: install needed packages for NetworkManager
   become: yes