From 80552aadfff87ea407f10926ffd1ed150f4a7b37 Mon Sep 17 00:00:00 2001 From: L3D Date: Wed, 17 Jul 2019 22:59:12 +0200 Subject: [PATCH] Resolve int issue --- tasks/main.yml | 12 ++++++------ tasks/sources.yml | 7 +++---- vars/main.yml | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 9431a72..6b9fa9a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -17,14 +17,14 @@ cache_valid_time: 43200 when: - ansible_os_family == 'Debian' - - ansible_machine != 'armv6l' and ansible_distribution_version < 8 + - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - name: Install common base packages [all] become: yes package: name: "{{ base_packages }}" state: present - when: ansible_machine != 'armv6l' and ansible_distribution_version < 8 + when: ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - name: Install common base packages [Fedora] become: yes @@ -43,7 +43,7 @@ - ansible_distribution_version != "14.04" - ansible_distribution_version != "12.04" - ansible_distribution_release != 'wheezy' - - ansible_machine != 'armv6l' and ansible_distribution_version < 8 + - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - name: Install extra packages become: true @@ -53,7 +53,7 @@ when: - packages_extra is defined - packages_extra != '[]' - - ansible_machine != 'armv6l' and ansible_distribution_version < 8 + - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - name: Remove rpcbind, nfs-common become: yes @@ -62,7 +62,7 @@ - rpcbind - nfs-common state: absent - when: ansible_machine != 'armv6l' and ansible_distribution_version < 8 + when: ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - name: Upgrade all packages to latest become: true @@ -71,7 +71,7 @@ state: latest when: - upgrade_packages_to_latest_version|bool - - ansible_machine != 'armv6l' and ansible_distribution_version < 8 + - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - include_tasks: editor.yml when: editor_is_vim | bool diff --git a/tasks/sources.yml b/tasks/sources.yml index 6f8327e..14bffad 100644 --- a/tasks/sources.yml +++ b/tasks/sources.yml @@ -11,8 +11,7 @@ cache_valid_time: 43200 when: - ansible_distribution == 'Debian' - - ansible_machine != 'armv6l' and ansible_distribution_version < 8 - + - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - name: add eth zurich apt become: true @@ -22,7 +21,7 @@ when: - add_ethz | bool - ansible_distribution == 'Debian' - - ansible_machine != 'armv6l' and ansible_distribution_version < 8 + - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' - name: remove eth zurich apt become: true @@ -32,4 +31,4 @@ when: - not add_ethz | bool - ansible_distribution == 'Debian' - - ansible_machine != 'armv6l' and ansible_distribution_version < 8 + - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy' diff --git a/vars/main.yml b/vars/main.yml index dd28378..fad6fb8 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -47,5 +47,5 @@ fedora_packages: - python3-pip - python3 -playbook_version_number: 8965 # should be over ninethousand +playbook_version_number: 8966 # should be over ninethousand playbook_version_path: '/etc/ansible-version/base-packages_ffbsee_or_chaos-bodensee_github.version'