testnode: remove tgt

As a follow up for commit 67a92953a5a2 ("testnode: don't install tgt"),
explicitly remove tgt to cover the case of it already being there.  This
also documents that we actively don't want tgt to be there.

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 1857798ee566ae897c001b698d2b5d9b4c073cdf..20bc4bef0b8d657a1392ea8f80efcdab5583f9b6 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
+  # tgt interferes with ceph-iscsi tests
+  - tgt
 
 ceph_packages_to_remove:
   - ceph

diff --git a/roles/testnode/vars/yum_systems.yml b/roles/testnode/vars/yum_systems.yml
index acfdf123efe963ab843a1a52f895857cf0ea71b0..8d2843a61c042bd016de17ca9cbc242100e8c695 100644 (file)
--- a/roles/testnode/vars/yum_systems.yml
+++ b/roles/testnode/vars/yum_systems.yml
@@ -5,6 +5,8 @@ ssh_service_name: sshd
 packages_to_remove:
   # multipath interferes with krbd tests
   - device-mapper-multipath
+  # tgt interferes with ceph-iscsi tests
+  - scsi-target-utils
 
 # ceph packages that we ensure do not exist
 ceph_packages_to_remove:

diff --git a/roles/testnode/vars/zypper_systems.yml b/roles/testnode/vars/zypper_systems.yml
index 8e0086abfbe1abe13056078c087c1b1ad75cda34..3ef15455eefb3343ab29611c7481f05a6b4c5893 100644 (file)
--- a/roles/testnode/vars/zypper_systems.yml
+++ b/roles/testnode/vars/zypper_systems.yml
@@ -9,6 +9,8 @@ nagios_plugins_directory: /usr/lib64/nagios/plugins
 packages_to_remove:
   # multipath interferes with krbd tests
   - multipath-tools
+  # tgt interferes with ceph-iscsi tests
+  - tgt
 
 # ceph packages that we ensure do not exist
 ceph_packages_to_remove: