testnode: move removing openmpi-common to apt_systems.yml

Otherwise, because it's placed in ubuntu.yml, it resets
packages_to_remove list defined in apt_systems.yml to just
openmpi-common and commit 701d3594d220 ("testnode: remove tgt")
doesn't take effect.

While at it, fix a typo in the comment -- it's mpich.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/roles/testnode/vars/apt_systems.yml b/roles/testnode/vars/apt_systems.yml
index 20bc4bef0b8d657a1392ea8f80efcdab5583f9b6..bdcda5169a47e55fa619f3bd1fe39dbdc910e347 100644 (file)
--- a/roles/testnode/vars/apt_systems.yml
+++ b/roles/testnode/vars/apt_systems.yml
@@ -6,6 +6,8 @@ nfs_service: nfs-kernel-server
 packages_to_remove:
   # multipath interferes with krbd tests
   - multipath-tools
+  # openmpi-common conflicts with mpich stuff
+  - openmpi-common
   # tgt interferes with ceph-iscsi tests
   - tgt
 

diff --git a/roles/testnode/vars/ubuntu.yml b/roles/testnode/vars/ubuntu.yml
index 9c6c83b9b67bef0892276a1408c795e2a37bfa25..36ee10aa1fe08cafd9729dfe9a2561908f8afcd5 100644 (file)
--- a/roles/testnode/vars/ubuntu.yml
+++ b/roles/testnode/vars/ubuntu.yml
@@ -92,7 +92,3 @@ non_aarch64_packages_to_upgrade:
 
 no_recommended_packages:
   - collectl
-
-packages_to_remove:
-   # openmpi-common conflicts with mpitch stuff
-  - openmpi-common