tests: reenable ceph-iscsi testing

This re-adds the ceph-iscsi testing for both non containerized and
containerized deployment since the rados connection error on ceph
dev has been fixed [1].

[1] https://tracker.ceph.com/issues/47002

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts
index 2868afed1434d79178d5a2717e2111b00ba725e3..fe64c8e8b35d82c27944298358a3a7fe236e5845 100644 (file)
--- a/tests/functional/all_daemons/container/hosts
+++ b/tests/functional/all_daemons/container/hosts
@@ -29,8 +29,8 @@ client1
 [rbdmirrors]
 rbd-mirror0
 
-#[iscsigws]
-#iscsi-gw0
+[iscsigws]
+iscsi-gw0
 
 [grafana-server]
 mon0

diff --git a/tests/functional/all_daemons/container/vagrant_variables.yml b/tests/functional/all_daemons/container/vagrant_variables.yml
index fd2dacf22a556caee24a500a88078448bc82aa2b..5e199588f02473ab0b7d38a078c684b6987969ed 100644 (file)
--- a/tests/functional/all_daemons/container/vagrant_variables.yml
+++ b/tests/functional/all_daemons/container/vagrant_variables.yml
@@ -12,7 +12,7 @@ nfs_vms: 1
 grafana_server_vms: 0
 rbd_mirror_vms: 1
 client_vms: 2
-iscsi_gw_vms: 0
+iscsi_gw_vms: 1
 mgr_vms: 1
 
 # SUBNETS TO USE FOR THE VMS

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index 4ca18d8870638eb002fdb0ab51eefa7b096f061e..1c3bc54a0f889ef15977d5b9d8cbc0e5f8127166 100644 (file)
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -30,7 +30,7 @@ nfs0
 rbd-mirror0
 
 [iscsigws]
-iscsi-gw0 ceph_repository="community" ceph_stable_release="octopus"
+iscsi-gw0
 
 [grafana-server]
 mon0