From: David Galloway <dgallowa@redhat.com>
Date: Wed, 3 Mar 2021 20:46:03 +0000 (-0500)
Subject: testnode: Install collectl without recommended packages
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4b8f876e3f024f44d685c00a058aa1b6c87765ee;p=ceph-cm-ansible.git

testnode: Install collectl without recommended packages

collectl has a bunch of Gnome Desktop Environment packages that are recommended.  So on Ubuntu 20.04 at least, a desktop environment was getting installed and would eventually go to sleep.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/roles/testnode/README.rst b/roles/testnode/README.rst
index 9dc7d35..857bf96 100644
--- a/roles/testnode/README.rst
+++ b/roles/testnode/README.rst
@@ -167,6 +167,10 @@ A list of packages to upgrade. These lists are defined in the vars files in ``va
 
     packages_to_upgrade: []
 
+A list of packages to install via ``apt install --no-install-recommends``::
+
+    no_recommended_packages: []
+
 A list of packages to install via pip. These lists are defined in the vars files in ``vars/``::
 
     pip_packages_to_install: []
diff --git a/roles/testnode/tasks/apt/packages.yml b/roles/testnode/tasks/apt/packages.yml
index 662a892..97e51e3 100644
--- a/roles/testnode/tasks/apt/packages.yml
+++ b/roles/testnode/tasks/apt/packages.yml
@@ -37,3 +37,10 @@
     state: present
     force: yes
   when: ansible_architecture != "aarch64"
+
+- name: Install packages with --no-install-recommends
+  apt:
+    name: "{{ no_recommended_packages|list }}"
+    state: present
+    install_recommends: no
+  when: no_recommended_packages|length > 0
diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml
index e864b91..31c70fc 100644
--- a/roles/testnode/vars/ubuntu.yml
+++ b/roles/testnode/vars/ubuntu.yml
@@ -53,7 +53,6 @@ common_packages:
   ###
   - vim
   - pdsh
-  - collectl
   # for blktrace and seekwatcher
   - blktrace
   ###
@@ -94,6 +93,9 @@ packages_to_upgrade:
 non_aarch64_packages_to_upgrade:
   - libapache2-mod-fastcgi
 
+no_recommended_packages:
+  - collectl
+
 packages_to_remove:
    # openmpi-common conflicts with mpitch stuff
   - openmpi-common