From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 27 Aug 2020 13:57:35 +0000 (-0400)
Subject: tests: reenable ceph-iscsi testing
X-Git-Tag: v6.0.0alpha2~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f308dcf4aa191b9a228dccbd2ae9cdc76a1c618;p=ceph-ansible.git

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 2868afed1..fe64c8e8b 100644
--- 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 fd2dacf22..5e199588f 100644
--- 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 4ca18d887..1c3bc54a0 100644
--- 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