From 1a7ff1a72a477399c2271fb51bf0b136bf2d5215 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 5 Apr 2016 11:32:05 -0400 Subject: [PATCH] Add asciidoc dep to lttng-tools --- automation/ansible/roles/lttng-tools/tasks/main.yml | 5 +++++ automation/ansible/roles/lttng-tools/tasks/setup-Debian.yml | 4 ++++ automation/ansible/roles/lttng-tools/vars/Debian.yml | 4 ++++ automation/ansible/roles/lttng-tools/vars/RedHat.yml | 2 ++ 4 files changed, 15 insertions(+) diff --git a/automation/ansible/roles/lttng-tools/tasks/main.yml b/automation/ansible/roles/lttng-tools/tasks/main.yml index e489481..e7261a1 100644 --- a/automation/ansible/roles/lttng-tools/tasks/main.yml +++ b/automation/ansible/roles/lttng-tools/tasks/main.yml @@ -8,6 +8,11 @@ lttng_tools_packages: "{{ __lttng_tools_packages | list }}" when: lttng_tools_packages is not defined +- name: Define lttng_tools_packages_no_recommends. + set_fact: + lttng_tools_packages_no_recommends: "{{ __lttng_tools_packages_no_recommends | list }}" + when: lttng_tools_packages_no_recommends is not defined + # Setup/install tasks. - include: setup-RedHat.yml when: ansible_os_family == 'RedHat' diff --git a/automation/ansible/roles/lttng-tools/tasks/setup-Debian.yml b/automation/ansible/roles/lttng-tools/tasks/setup-Debian.yml index 2b5750e..de11c86 100644 --- a/automation/ansible/roles/lttng-tools/tasks/setup-Debian.yml +++ b/automation/ansible/roles/lttng-tools/tasks/setup-Debian.yml @@ -5,3 +5,7 @@ - name: Ensure lttng-tools build dependencies are installed. apt: "name={{ item }} state=installed" with_items: lttng_tools_packages + +- name: Ensure lttng-tools build dependencies are installed (no recommends). + apt: "name={{ item }} state=installed install_recommends=no" + with_items: lttng_tools_packages_no_recommends diff --git a/automation/ansible/roles/lttng-tools/vars/Debian.yml b/automation/ansible/roles/lttng-tools/vars/Debian.yml index d3d2107..77f635d 100644 --- a/automation/ansible/roles/lttng-tools/vars/Debian.yml +++ b/automation/ansible/roles/lttng-tools/vars/Debian.yml @@ -3,3 +3,7 @@ __lttng_tools_packages: - libpopt-dev - libxml2-dev - bash-completion + +__lttng_tools_packages_no_recommends: + - asciidoc + - xmlto diff --git a/automation/ansible/roles/lttng-tools/vars/RedHat.yml b/automation/ansible/roles/lttng-tools/vars/RedHat.yml index 4ea6f38..bc31117 100644 --- a/automation/ansible/roles/lttng-tools/vars/RedHat.yml +++ b/automation/ansible/roles/lttng-tools/vars/RedHat.yml @@ -1,3 +1,5 @@ --- # TODO __lttng_tools_packages: + +__lttng_tools_packages_no_recommends: -- 2.34.1