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 701d359 ("testnode: remove tgt") doesn't take effect. While at it, fix a typo in the comment -- it's mpich. Signed-off-by: Ilya Dryomov <[email protected]>
ceph · Oct 1, 2024 · f5d34df · f5d34df
1 parent 041d4d4
commit f5d34df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -92,7 +92,3 @@ non_aarch64_packages_to_upgrade:
 
 no_recommended_packages:
   - collectl
-
-packages_to_remove:
-   # openmpi-common conflicts with mpitch stuff
-  - openmpi-common