From 5f57bce0811b2ce4f8a92d4a8f03f75e3a54f569 Mon Sep 17 00:00:00 2001 From: Lilian Roller Date: Wed, 24 Apr 2019 14:50:40 +0200 Subject: [PATCH] improve ansible workflow for more than one devices --- host_vars/desk_minni.yml | 2 ++ host_vars/l460.yml | 4 ++++ host_vars/t460p.yml | 2 ++ roles/copy_files/defaults/main.yml | 2 ++ roles/copy_files/tasks/main.yml | 6 +++--- roles/i3wm | 2 +- roles/networkmanager/tasks/main.yml | 4 ++-- 7 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 roles/copy_files/defaults/main.yml diff --git a/host_vars/desk_minni.yml b/host_vars/desk_minni.yml index ce41916..e80b715 100644 --- 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 index 5a0d23a..e80b715 100644 --- 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 index e01e6f1..ff0dd19 100644 --- 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 new file mode 100644 index 0000000..732b813 --- /dev/null +++ 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 index 17bb439..44c1d7c 100644 --- 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 index a709236..612f332 160000 --- a/roles/i3wm +++ b/roles/i3wm @@ -1 +1 @@ -Subproject commit a7092361c7aa3939afa0079ddb874f8319c56f9f +Subproject commit 612f3326b63959f95e71daffe201b188b3f5b5a7 diff --git a/roles/networkmanager/tasks/main.yml b/roles/networkmanager/tasks/main.yml index 319ce15..ae2c683 100644 --- 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