From 14cd286e3a90d521341833b1d2e23dbb9740cb89 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= 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=utf8 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 --- 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/fedora/29/container-podman/hosts | 4 ++-- .../fedora/29/container-podman/vagrant_variables.yml | 2 +- tests/functional/ubuntu/16.04/cluster/hosts | 4 ++-- tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/functional/centos/7/docker-collocation/hosts b/tests/functional/centos/7/docker-collocation/hosts index 7a958f129..c7d3d34c6 100644 --- a/tests/functional/centos/7/docker-collocation/hosts +++ b/tests/functional/centos/7/docker-collocation/hosts @@ -18,6 +18,6 @@ mds0 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 2623af53a..042567913 100644 --- a/tests/functional/centos/7/docker/hosts +++ b/tests/functional/centos/7/docker/hosts @@ -13,8 +13,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 07dab2904..78166da85 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/fedora/29/container-podman/hosts b/tests/functional/fedora/29/container-podman/hosts index d45a218c3..e237a2abd 100644 --- a/tests/functional/fedora/29/container-podman/hosts +++ b/tests/functional/fedora/29/container-podman/hosts @@ -13,8 +13,8 @@ mds0 [rgws] rgw0 -[nfss] -nfs0 +#[nfss] +#nfs0 [clients] client0 diff --git a/tests/functional/fedora/29/container-podman/vagrant_variables.yml b/tests/functional/fedora/29/container-podman/vagrant_variables.yml index 395202600..60fe3342f 100644 --- a/tests/functional/fedora/29/container-podman/vagrant_variables.yml +++ b/tests/functional/fedora/29/container-podman/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 3c47c8401..fcba73098 100644 --- a/tests/functional/ubuntu/16.04/cluster/hosts +++ b/tests/functional/ubuntu/16.04/cluster/hosts @@ -15,5 +15,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 8c70e17eb..e50bee290 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 -- 2.47.3