Skip to content

Commit ef64fdb

Browse files
committed
Stream line package selection
Avoiding having lots of files to look through and instead put everything in a single place for easier lookup and modification.
1 parent 6410106 commit ef64fdb

6 files changed

Lines changed: 47 additions & 40 deletions

File tree

tasks/main.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,17 @@
1818
unarchive:
1919
src: "{{ thinlinc_server_bundle }}"
2020
dest: /root
21-
- include_vars: "packages-rpm-{{ ansible_architecture }}.yml"
21+
- name: Checking if rpm platform
22+
set_fact:
23+
_tl_pkg_fmt: rpm
2224
when: ansible_os_family in ["RedHat", "Suse"]
23-
- include_vars: "packages-deb-{{ ansible_architecture }}.yml"
25+
- name: Checking if deb platform
26+
set_fact:
27+
_tl_pkg_fmt: deb
2428
when: ansible_os_family in ["Debian", "Ubuntu", "Linuxmint"]
29+
- name: Checking which packages to install
30+
set_fact:
31+
thinlinc_packages: "{{ _thinlinc_packages[ansible_architecture][_tl_pkg_fmt] }}"
2532
- include_tasks: "install-thinlinc-rhel.yml"
2633
when: ansible_os_family == "RedHat"
2734
- include_tasks: "install-thinlinc-suse.yml"

vars/main.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,40 @@
11
---
22
pkgdir: "/root/tl-{{thinlinc_version}}-server/packages"
3+
4+
_thinlinc_packages:
5+
i386:
6+
rpm:
7+
- "{{ pkgdir }}/thinlinc-tladm-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
8+
- "{{ pkgdir }}/thinlinc-tlmisc-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
9+
- "{{ pkgdir }}/thinlinc-tlmisc-libs32-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
10+
- "{{ pkgdir }}/thinlinc-tlprinter-{{ thinlinc_version }}-{{ thinlinc_build }}.noarch.rpm"
11+
- "{{ pkgdir }}/thinlinc-webaccess-{{ thinlinc_version }}-{{ thinlinc_build }}.noarch.rpm"
12+
- "{{ pkgdir }}/thinlinc-vnc-server-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
13+
- "{{ pkgdir }}/thinlinc-vsm-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
14+
deb:
15+
- "{{ pkgdir }}/thinlinc-tladm_{{ thinlinc_version }}-{{ thinlinc_build }}_i386.deb"
16+
- "{{ pkgdir }}/thinlinc-tlmisc_{{ thinlinc_version }}-{{ thinlinc_build }}_i386.deb"
17+
- "{{ pkgdir }}/thinlinc-tlmisc-libs32_{{ thinlinc_version }}-{{ thinlinc_build }}_i386.deb"
18+
- "{{ pkgdir }}/thinlinc-tlprinter_{{ thinlinc_version }}-{{ thinlinc_build }}_all.deb"
19+
- "{{ pkgdir }}/thinlinc-webaccess_{{ thinlinc_version }}-{{ thinlinc_build }}_all.deb"
20+
- "{{ pkgdir }}/thinlinc-vnc-server_{{ thinlinc_version }}-{{ thinlinc_build }}_i386.deb"
21+
- "{{ pkgdir }}/thinlinc-vsm_{{ thinlinc_version }}-{{ thinlinc_build }}_i386.deb"
22+
x86_64:
23+
rpm:
24+
- "{{ pkgdir }}/thinlinc-tladm-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
25+
- "{{ pkgdir }}/thinlinc-tlmisc-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
26+
- "{{ pkgdir }}/thinlinc-tlmisc-libs32-{{ thinlinc_version }}-{{ thinlinc_build }}.i686.rpm"
27+
- "{{ pkgdir }}/thinlinc-tlmisc-libs-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
28+
- "{{ pkgdir }}/thinlinc-tlprinter-{{ thinlinc_version }}-{{ thinlinc_build }}.noarch.rpm"
29+
- "{{ pkgdir }}/thinlinc-webaccess-{{ thinlinc_version }}-{{ thinlinc_build }}.noarch.rpm"
30+
- "{{ pkgdir }}/thinlinc-vnc-server-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
31+
- "{{ pkgdir }}/thinlinc-vsm-{{ thinlinc_version }}-{{ thinlinc_build }}.x86_64.rpm"
32+
deb:
33+
- "{{ pkgdir }}/thinlinc-tladm_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
34+
- "{{ pkgdir }}/thinlinc-tlmisc_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
35+
- "{{ pkgdir }}/thinlinc-tlmisc-libs32_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
36+
- "{{ pkgdir }}/thinlinc-tlmisc-libs_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
37+
- "{{ pkgdir }}/thinlinc-tlprinter_{{ thinlinc_version }}-{{ thinlinc_build }}_all.deb"
38+
- "{{ pkgdir }}/thinlinc-webaccess_{{ thinlinc_version }}-{{ thinlinc_build }}_all.deb"
39+
- "{{ pkgdir }}/thinlinc-vnc-server_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"
40+
- "{{ pkgdir }}/thinlinc-vsm_{{ thinlinc_version }}-{{ thinlinc_build }}_amd64.deb"

vars/packages-deb-i386.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

vars/packages-deb-x86_64.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

vars/packages-rpm-i386.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

vars/packages-rpm-x86_64.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)