Add asciidoc dep to lttng-tools

diff --git a/automation/ansible/roles/lttng-tools/tasks/main.yml b/automation/ansible/roles/lttng-tools/tasks/main.yml
index e4894816881dca13d38af3b641dc7c6064829a28..e7261a1319c3d159c84da23f925cc40615203c01 100644 (file)
--- 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 2b5750eab5c996706723751f0dfce8c06b4de16b..de11c86083d9a3de728ab9d67313d2f4d2a98623 100644 (file)
--- 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 d3d210719a2f0dfcc3e8b2703fce4d0dcb02e761..77f635d791a0155708c3f9ee3535106b3fb39cf2 100644 (file)
--- 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 4ea6f38446b5b48591ce935176aed8fa91104091..bc311177166123dfd3ea9754d14b51fb4de6266a 100644 (file)
--- 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: