1
0
Fork 0
mirror of https://github.com/roles-ansible/ansible_role_base.git synced 2024-08-16 14:29:50 +02:00

Optimize non-free handling

This commit is contained in:
L3D 2019-07-20 22:38:49 +02:00
parent 80552aadff
commit 66a49b666f
Signed by: l3d
GPG key ID: CD08445BFF4313D1
3 changed files with 29 additions and 2 deletions

View file

@ -16,5 +16,8 @@ editor_is_vim: true
# print os variables # print os variables
print_os_vars: false print_os_vars: false
# do we want non-free firmware from eth zuerich?
base_pkg_non_free_firmware: false
# version management # version management
submodules_versioncheck: true submodules_versioncheck: true

View file

@ -19,6 +19,7 @@
repo: deb https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main repo: deb https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main
state: present state: present
when: when:
- not base_pkg_non_free_firmware | bool
- add_ethz | bool - add_ethz | bool
- ansible_distribution == 'Debian' - ansible_distribution == 'Debian'
- ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
@ -26,9 +27,32 @@
- name: remove eth zurich apt - name: remove eth zurich apt
become: true become: true
apt_repository: apt_repository:
repo: deb-src https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main repo: deb https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main
state: absent state: absent
when: when:
- not base_pkg_non_free_firmware | bool
- not add_ethz | bool
- ansible_distribution == 'Debian'
- ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
- name: add eth zurich apt
become: true
apt_repository:
repo: deb-src https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main non-free
state: present
when:
- base_pkg_non_free_firmware | bool
- add_ethz | bool
- ansible_distribution == 'Debian'
- ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
- name: remove eth zurich apt
become: true
apt_repository:
repo: deb-src https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main non-free
state: absent
when:
- base_pkg_non_free_firmware | bool
- not add_ethz | bool - not add_ethz | bool
- ansible_distribution == 'Debian' - ansible_distribution == 'Debian'
- ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'

View file

@ -47,5 +47,5 @@ fedora_packages:
- python3-pip - python3-pip
- python3 - python3
playbook_version_number: 8966 # should be over ninethousand playbook_version_number: 8968 # should be over ninethousand
playbook_version_path: '/etc/ansible-version/base-packages_ffbsee_or_chaos-bodensee_github.version' playbook_version_path: '/etc/ansible-version/base-packages_ffbsee_or_chaos-bodensee_github.version'