From fa8bd10cac7253c83fc1cfb4c00ed6eb1bb47e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Tue, 4 Dec 2018 10:44:28 +0100
Subject: [PATCH] test: disable nfs for containers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Based on https://github.com/ceph/ceph-container/pull/1269 and given
there are no stable packages and reliable repository, we disable nfs
ganesha temporarly.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 6c3ef90ebe94eb874b415d1cfcf329e20232ba9a)
---
 tests/functional/centos/7/docker-collocation/hosts          | 6 +++---
 tests/functional/centos/7/docker/hosts                      | 4 ++--
 tests/functional/centos/7/docker/vagrant_variables.yml      | 2 +-
 tests/functional/ubuntu/16.04/cluster/hosts                 | 4 ++--
 tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/functional/centos/7/docker-collocation/hosts b/tests/functional/centos/7/docker-collocation/hosts
index 2ecd00253..834fddc7f 100644
--- a/tests/functional/centos/7/docker-collocation/hosts
+++ b/tests/functional/centos/7/docker-collocation/hosts
@@ -22,6 +22,6 @@ osd0
 rgw0
 mds0
 
-[nfss]
-rgw0
-mds0
+#[nfss]
+#rgw0
+#mds0
diff --git a/tests/functional/centos/7/docker/hosts b/tests/functional/centos/7/docker/hosts
index 3421926b5..fecf55a54 100644
--- a/tests/functional/centos/7/docker/hosts
+++ b/tests/functional/centos/7/docker/hosts
@@ -16,8 +16,8 @@ mds0
 [rgws]
 rgw0
 
-[nfss]
-nfs0
+#[nfss]
+#nfs0
 
 [clients]
 client0
diff --git a/tests/functional/centos/7/docker/vagrant_variables.yml b/tests/functional/centos/7/docker/vagrant_variables.yml
index ad8beaf5a..81d5cc7aa 100644
--- a/tests/functional/centos/7/docker/vagrant_variables.yml
+++ b/tests/functional/centos/7/docker/vagrant_variables.yml
@@ -8,7 +8,7 @@ mon_vms: 3
 osd_vms: 2
 mds_vms: 1
 rgw_vms: 1
-nfs_vms: 1
+nfs_vms: 0
 rbd_mirror_vms: 1
 client_vms: 2
 iscsi_gw_vms: 1
diff --git a/tests/functional/ubuntu/16.04/cluster/hosts b/tests/functional/ubuntu/16.04/cluster/hosts
index 98355f3b8..5307fbc5a 100644
--- a/tests/functional/ubuntu/16.04/cluster/hosts
+++ b/tests/functional/ubuntu/16.04/cluster/hosts
@@ -18,5 +18,5 @@ rgw0
 [clients]
 client0
 
-[nfss]
-nfs0
+#[nfss]
+#nfs0
diff --git a/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
index 7a7c163c0..d7d56f574 100644
--- a/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
+++ b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
@@ -8,7 +8,7 @@ mon_vms: 3
 osd_vms: 1
 mds_vms: 1
 rgw_vms: 1
-nfs_vms: 1
+nfs_vms: 0
 rbd_mirror_vms: 0
 client_vms: 1
 iscsi_gw_vms: 0