Fix roles for Ansible 2.7

roles/apt-meta/tasks/main.yml

@@ -1,24 +1,25 @@
 ---
 
-- name: ensure apt cache is up to date
-  apt:
-    force_apt_get: yes
-    update_cache: yes
-    cache_valid_time: 3600
-  become: yes
-  changed_when: False
-  check_mode: False
+#- name: ensure apt cache is up to date
+#  apt:
+#    force_apt_get: yes
+#    update_cache: yes
+#    cache_valid_time: 3600
+#  become: yes
+#  changed_when: False
+#  check_mode: False
 
 - name: ensure apt packages are managed
   apt:
     state: "{{ apt_state }}"
-    name: "{{ item }}"
+    name: "{{ packages }}"
     autoclean: yes
     autoremove: yes
     force_apt_get: yes
     update_cache: yes
     cache_valid_time: 3600
     install_recommends: no
+  vars:
+    packages: "{{ apt_packages }}"
   become: yes
-  with_items: "{{ apt_packages }}"
   #notify: clean apt

roles/apt-repo-meta/tasks/main.yml

@@ -3,11 +3,10 @@
 - name: ensure required packages are installed
   apt:
     state: latest
-    name: "{{ item }}"
+    name: "{{ apt_repo_packages }}"
     update_cache: yes
     install_recommends: no
   become: yes
-  with_items: "{{ apt_repo_packages }}"
 
 - name: ensure default sources.list is removed
   file:

roles/autorunner/tasks/install.yml

@@ -4,8 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ autorunner_shared_packages }}"
+    apt_packages: "{{ autorunner_shared_packages }}"
 
 - name: ensure autorunner is downloaded
   get_url:

roles/chromium/tasks/install.yml

@@ -4,9 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ chromium_package_name }}"
-      - "{{ chromium_shared_packages }}"
+    apt_packages: "{{ [chromium_package_name] + chromium_shared_packages }}"
 
 - name: ensure chromium extension directory exists
   file:

roles/chromium/tasks/uninstall.yml

@@ -5,5 +5,4 @@
     name: apt-meta
   vars:
     apt_state: absent
-    apt_packages:
-      - "{{ chromium_package_name }}"
+    apt_packages: "{{ chromium_package_name }}"

roles/clipmenu/tasks/install.yml

@@ -4,8 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ clipmenu_shared_packages }}"
+    apt_packages: "{{ clipmenu_shared_packages }}"
 
 - name: ensure clipmenu is downloaded
   get_url:

roles/dbeaver/tasks/install.yml

@@ -4,8 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ dbeaver_shared_packages }}"
+    apt_packages: "{{ dbeaver_shared_packages }}"
 
 - name: ensure dbeaver deb path exists
   file:

roles/dbeaver/tasks/uninstall.yml

@@ -5,8 +5,7 @@
     name: apt-meta
   vars:
     apt_state: absent
-    apt_packages:
-      - "{{ dbeaver_package_name }}"
+    apt_packages: "{{ dbeaver_package_name }}"
 
 - name: ensure dbeaver deb directory is removed
   file:

roles/docker-compose/tasks/install.yml

@@ -1,26 +1,32 @@
 ---
 
-- name: fetch docker compose info
-  uri:
-    url: https://api.github.com/repos/docker/compose/releases/latest
-    method: GET
-  register: docker_json
-  check_mode: no
+- name: ensure docker-compose is installed
+  include_role:
+    name: apt-meta
+  vars:
+    apt_packages: "{{ [docker_compose_package_name] }}"
 
-- name: set latest docker compose version
-  set_fact:
-    docker_compose_version: "{{ docker_json.json.name }}"
-  check_mode: no
-
-- name: ensure docker compose is downloaded
-  get_url:
-    url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64"
-    dest: "{{ docker_compose_path }}"
-    mode: 0755
-    force: yes
-    timeout: 30
-  register: task_result
-  until: task_result | succeeded
-  retries: 10
-  delay: 5
-  become: yes
+#- name: fetch docker compose info
+#  uri:
+#    url: https://api.github.com/repos/docker/compose/releases/latest
+#    method: GET
+#  register: docker_json
+#  check_mode: no
+#
+#- name: set latest docker compose version
+#  set_fact:
+#    docker_compose_version: "{{ docker_json.json.name }}"
+#  check_mode: no
+#
+#- name: ensure docker compose is downloaded
+#  get_url:
+#    url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64"
+#    dest: "{{ docker_compose_path }}"
+#    mode: 0755
+#    force: yes
+#    timeout: 30
+#  register: task_result
+#  until: task_result is succeeded
+#  retries: 10
+#  delay: 5
+#  become: yes

roles/docker-compose/tasks/uninstall.yml

@@ -1,7 +1,14 @@
 ---
 
-- name: ensure docker compose is removed
-  file:
-    state: absent
-    path: "{{ docker_compose_path }}"
-  become: yes
+- name: ensure docker-compose is removed
+  include_role:
+    name: apt-meta
+  vars:
+    apt_state: absent
+    apt_packages: "{{ docker_compose_package_name }}"
+
+#- name: ensure docker compose is removed
+#  file:
+#    state: absent
+#    path: "{{ docker_compose_path }}"
+#  become: yes

roles/docker-compose/vars/main.yml

@@ -1,3 +1,3 @@
 ---
 
-docker_compose_path: /usr/local/bin/docker-compose
+docker_compose_package_name: docker-compose

roles/docker/tasks/install.yml

@@ -13,8 +13,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ docker_package_name }}"
+    apt_packages: "{{ [docker_package_name] }}"
 
 - name: set username
   command: whoami

roles/docker/tasks/uninstall.yml

@@ -5,8 +5,7 @@
     name: apt-meta
   vars:
     apt_state: absent
-    apt_packages:
-      - "{{ docker_package_name }}"
+    apt_packages: "{{ [docker_package_name] }}"
 
 - name: ensure docker repo is removed
   include_role:

roles/ffscreencast/tasks/install.yml

@@ -4,8 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ ffscreencast_shared_packages }}"
+    apt_packages: "{{ ffscreencast_shared_packages }}"
 
 - name: ensure ffscreencast is downloaded
   get_url:

roles/fzf/tasks/install.yml

@@ -4,8 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ fzf_shared_packages }}"
+    apt_packages: "{{ fzf_shared_packages }}"
 
 - name: ensure ./local/share directory exists
   file:

roles/gimp/tasks/install.yml

@@ -11,9 +11,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ gimp_package_name }}"
-      - "{{ gimp_required_packages }}"
+    apt_packages: "{{ [gimp_package_name] + gimp_required_packages }}"
 
 - name: ensure gimp configuration directories exist
   file:

roles/gimp/tasks/uninstall.yml

@@ -5,9 +5,7 @@
     name: apt-meta
   vars:
     apt_state: absent
-    apt_packages:
-      - "{{ gimp_package_name }}"
-      - "{{ gimp_required_packages }}"
+    apt_packages: "{{ [gimp_package_name] + gimp_required_packages }}"
 
 - name: ensure gimp configuration directory is removed
   file:

roles/hipchat/tasks/install.yml

@@ -4,8 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ hipchat_shared_packages }}"
+    apt_packages: "{{ hipchat_shared_packages }}"
 
 - name: ensure hipchat repo is present
   include_role:

roles/i3-gaps/tasks/install.yml

@@ -4,9 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ i3_gaps_shared_packages }}"
-      - "{{ i3_gaps_build_dependencies }}"
+    apt_packages: "{{ i3_gaps_shared_packages + i3_gaps_build_dependencies }}"
 
 - name: ensure git parent path exists
   file:

roles/i3-utils-bin/tasks/install.yml

@@ -4,8 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ i3_utils_bin_shared_packages }}"
+    apt_packages: "{{ i3_utils_bin_shared_packages }}"
 
 - name: ensure i3-utils-bin tools are downloaded
   get_url:

roles/i3-utils-systemd/tasks/install.yml

@@ -4,8 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ i3_utils_systemd_shared_packages }}"
+    apt_packages: "{{ i3_utils_systemd_shared_packages }}"
 
 - name: ensure xlock is downloaded
   get_url:

roles/i3blocks-modules/tasks/install.yml

@@ -4,8 +4,7 @@
   include_role:
     name: apt-meta
   vars:
-    apt_packages:
-      - "{{ i3blocks_modules_shared_packages }}"
+    apt_packages: "{{ i3blocks_modules_shared_packages }}"
 
 - name: ensure ./local/share directory exists
   file:

roles/libreoffice/defaults/main.yml

@@ -2,5 +2,3 @@
 
 # 'install', 'remove' or 'ignore'
 libreoffice: 'ignore'
-
-libreoffice_dpi: 96