Merge branch 'upgrade' of https://github.com/cendio/ansible-role-thinlinc-server

Author: CendioOssman

tasks/install-thinlinc-debian.yml

@@ -1,11 +1,8 @@
 ---
-# Because of circular dependencies, we need to install all packages at
-# once. I can't get the apt provider to install multiple local
-# packages all at once though. :/
-#
-#  apt: deb="{{ item }}" state=present
-#  with_items: "{{ thinlinc_packages }}"
+# The apt provider actually calls dpkg for local packages, which isn't
+# clever enough to handle our upgrades:
+# https://github.com/ansible/ansible/issues/77150
 
 - name: Install ThinLinc Software
-  command: "/usr/bin/dpkg --install --no-debsig --force-confold {{ ' '.join(thinlinc_packages) }}"
+  command: "/usr/bin/apt install -y -o \"Dpkg::Options::=--no-debsig\" -o \"Dpkg::Options::=--force-confold\" {{ ' '.join(thinlinc_packages) }}"
   notify: run tl-setup

tasks/main.yml

@@ -15,12 +15,20 @@
         src: "{{ thinlinc_server_bundle }}"
         dest: /root
         creates: "{{ pkgdir }}"
-    - name: Load vars for {{ ansible_facts['architecture'] }} RPMs
-      include_vars: "packages-rpm-{{ ansible_facts['architecture'] }}.yml"
+    - name: Checking if rpm platform
+      set_fact:
+        _tl_pkg_fmt: rpm
       when: ansible_facts['os_family'] in ["RedHat", "Suse"]
-    - name: Load vars for {{ ansible_facts['architecture'] }} DEBs
-      include_vars: "packages-deb-{{ ansible_facts['architecture'] }}.yml"
+    - name: Checking if deb platform
+      set_fact:
+        _tl_pkg_fmt: deb
       when: ansible_facts['os_family'] in ["Debian", "Ubuntu", "Linuxmint"]
+    - name: Checking which packages to install
+      set_fact:
+        thinlinc_packages:
+          "{{ _thinlinc_packages[ansible_architecture][_tl_pkg_fmt] if
+          ( thinlinc_version is version('4.14.0', '>') ) else
+          _old_thinlinc_packages[ansible_architecture][_tl_pkg_fmt] }}"
     - name: Run tasks for RHEL-like
       include_tasks: "install-thinlinc-rhel.yml"
       when: ansible_facts['os_family'] == "RedHat"
@@ -31,8 +39,11 @@
       include_tasks: "install-thinlinc-debian.yml"
       when: ansible_facts['os_family'] in ["Debian", "Ubuntu", "Linuxmint"]
   when: >
-    ansible_facts['packages']['thinlinc-vsm'][0]['version'] is not defined or
-    ansible_facts['packages']['thinlinc-vsm'][0]['version'] != thinlinc_version
+    (('thinlinc-server' not in ansible_facts['packages']) or
+     (ansible_facts['packages']['thinlinc-server'][0]['version'] != thinlinc_version))
+    and
+    (('thinlinc-vsm' not in ansible_facts['packages']) or
+     (ansible_facts['packages']['thinlinc-vsm'][0]['version'] != thinlinc_version))
 
 # Workaround for OpenSUSE Tumbleweed usr merge
 # See https://www.cendio.com/bugzilla/show_bug.cgi?id=7829

templates/thinlinc-setup.answers.j2

@@ -6,7 +6,7 @@ setup-firewall=yes
 setup-selinux=yes
 setup-web-integration=yes
 setup-apparmor=yes
-{% if ansible_facts['fqdn'] in groups['thinlinc_masters'] %}
+{% if ('thinlinc_masters' not in group_names) or (ansible_facts['fqdn'] in groups['thinlinc_masters']) %}
 server-type=master
 {% else %}
 server-type=agent

vars/main.yml

@@ -1,2 +1,47 @@
 ---
 pkgdir: "/root/tl-{{thinlinc_version}}-server/packages"
+
+_thinlinc_packages:
+  x86_64:
+    rpm:
+      - "{{ pkgdir }}/thinlinc-server-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
+    deb:
+      - "{{ pkgdir }}/thinlinc-server_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
+
+_old_thinlinc_packages:
+  i386:
+    rpm:
+      - "{{ pkgdir }}/thinlinc-tladm-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
+      - "{{ pkgdir }}/thinlinc-tlmisc-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
+      - "{{ pkgdir }}/thinlinc-tlmisc-libs32-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
+      - "{{ pkgdir }}/thinlinc-tlprinter-{{ thinlinc_version }}-{{ thinlinc_build }}.noarch.rpm"
+      - "{{ pkgdir }}/thinlinc-webaccess-{{ thinlinc_version }}-{{ thinlinc_build }}.noarch.rpm"
+      - "{{ pkgdir }}/thinlinc-vnc-server-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
+      - "{{ pkgdir }}/thinlinc-vsm-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
+    deb:
+      - "{{ pkgdir }}/thinlinc-tladm_{{ thinlinc_version }}-{{ thinlinc_build }}_i386.deb"
+      - "{{ pkgdir }}/thinlinc-tlmisc_{{ thinlinc_version }}-{{ thinlinc_build }}_i386.deb"
+      - "{{ pkgdir }}/thinlinc-tlmisc-libs32_{{ thinlinc_version }}-{{ thinlinc_build }}_i386.deb"
+      - "{{ pkgdir }}/thinlinc-tlprinter_{{ thinlinc_version }}-{{ thinlinc_build }}_all.deb"
+      - "{{ pkgdir }}/thinlinc-webaccess_{{ thinlinc_version }}-{{ thinlinc_build }}_all.deb"
+      - "{{ pkgdir }}/thinlinc-vnc-server_{{ thinlinc_version }}-{{ thinlinc_build }}_i386.deb"
+      - "{{ pkgdir }}/thinlinc-vsm_{{ thinlinc_version }}-{{ thinlinc_build }}_i386.deb"
+  x86_64:
+    rpm:
+      - "{{ pkgdir }}/thinlinc-tladm-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
+      - "{{ pkgdir }}/thinlinc-tlmisc-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
+      - "{{ pkgdir }}/thinlinc-tlmisc-libs32-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
+      - "{{ pkgdir }}/thinlinc-tlmisc-libs-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
+      - "{{ pkgdir }}/thinlinc-tlprinter-{{ thinlinc_version }}-{{ thinlinc_build }}.noarch.rpm"
+      - "{{ pkgdir }}/thinlinc-webaccess-{{ thinlinc_version }}-{{ thinlinc_build }}.noarch.rpm"
+      - "{{ pkgdir }}/thinlinc-vnc-server-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
+      - "{{ pkgdir }}/thinlinc-vsm-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
+    deb:
+      - "{{ pkgdir }}/thinlinc-tladm_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
+      - "{{ pkgdir }}/thinlinc-tlmisc_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
+      - "{{ pkgdir }}/thinlinc-tlmisc-libs32_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
+      - "{{ pkgdir }}/thinlinc-tlmisc-libs_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
+      - "{{ pkgdir }}/thinlinc-tlprinter_{{ thinlinc_version }}-{{ thinlinc_build }}_all.deb"
+      - "{{ pkgdir }}/thinlinc-webaccess_{{ thinlinc_version }}-{{ thinlinc_build }}_all.deb"
+      - "{{ pkgdir }}/thinlinc-vnc-server_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
+      - "{{ pkgdir }}/thinlinc-vsm_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"