From 02a7fa60df1ccb664b465659c7c41791e3ec0b8e Mon Sep 17 00:00:00 2001 From: Lilian Roller Date: Tue, 14 May 2019 17:37:22 +0200 Subject: [PATCH] Change default options --- defaults/main.yml | 38 +++----------------------------------- tasks/main.yml | 10 ++++++++++ vars/main.yml | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 49 insertions(+), 36 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 524b6b2..ba856b3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,38 +1,6 @@ --- -base_packages: - - tmux - - sudo - - htop - - iftop - - iotop - - sysstat - - ethtool - - ethstatus - - nethogs - - nload - - ncdu - - atop - - vim - - nmap - - python3 - - wget - - git - - bash-completion - - unzip - - python3-pip - - asciinema - - ranger - - net-tools - - links - -debian_packages: - - molly-guard - - mtr-tiny - - knot-dnsutils - -fedora_packages: - - mtr - - libselinux-python - +packages_extra: [] +# - foo +# - bar upgrade_packages_to_latest_version: false submodules_versioncheck: true diff --git a/tasks/main.yml b/tasks/main.yml index a736f9e..958ca8e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -81,6 +81,16 @@ cache_valid_time: 43200 when: ansible_distribution == 'Debian' +- name: Install extra packages + become: true + package: + name: "{{ packages_extra }}" + state: present + when: + - packages_extra is defined + - packages_extra != "" + - packages_extra != '[]' + - name: Remove rpcbind, nfs-common become: yes package: diff --git a/vars/main.yml b/vars/main.yml index 9a46404..1cfcd1f 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,3 +1,38 @@ --- -playbook_version_number: 100 +base_packages: + - tmux + - sudo + - htop + - iftop + - iotop + - sysstat + - ethtool + - ethstatus + - nethogs + - nload + - ncdu + - atop + - vim + - nmap + - python3 + - wget + - git + - bash-completion + - unzip + - python3-pip + - asciinema + - ranger + - net-tools + - links + +debian_packages: + - molly-guard + - mtr-tiny + - knot-dnsutils + +fedora_packages: + - mtr + - libselinux-python + +playbook_version_number: 101 playbook_version_path: '/etc/ansible-version/base-packages_ffbsee_github.version'