From: Andrew Schoen Date: Tue, 6 Feb 2018 17:36:03 +0000 (-0600) Subject: ceph-volume: do not test custom cluster names with simple X-Git-Tag: v13.0.2~330^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=63046e0d7bd05a42477dd1fbd4af11f81046b08d;p=ceph.git ceph-volume: do not test custom cluster names with simple Signed-off-by: Andrew Schoen --- diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/group_vars/all index 560c8b03b172b..4fa4035ed4d51 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/group_vars/all @@ -1,7 +1,7 @@ --- ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/group_vars/all index 83d24e0a0135a..3c91f840f38bf 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/group_vars/all @@ -2,7 +2,7 @@ dmcrypt: True ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/group_vars/all index 674abc9390ce3..75dadacaf1e37 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/group_vars/all @@ -2,7 +2,7 @@ dmcrypt: True ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/group_vars/all index 8902bdda37e96..37a20cff6858e 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/group_vars/all @@ -1,7 +1,7 @@ --- ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/group_vars/all index c8ba0ba4c08b2..2e93089d8c8a5 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/group_vars/all @@ -2,7 +2,7 @@ dmcrypt: True ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/group_vars/all index 29e82024c7a7e..ab0b20c9e6ad8 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/group_vars/all @@ -2,7 +2,7 @@ dmcrypt: True ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/group_vars/all index 560c8b03b172b..4fa4035ed4d51 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/group_vars/all @@ -1,7 +1,7 @@ --- ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/group_vars/all index 83d24e0a0135a..3c91f840f38bf 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/group_vars/all @@ -2,7 +2,7 @@ dmcrypt: True ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/group_vars/all index 674abc9390ce3..75dadacaf1e37 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/group_vars/all @@ -2,7 +2,7 @@ dmcrypt: True ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/group_vars/all index 8902bdda37e96..37a20cff6858e 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/group_vars/all @@ -1,7 +1,7 @@ --- ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/group_vars/all index c8ba0ba4c08b2..2e93089d8c8a5 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/group_vars/all @@ -2,7 +2,7 @@ dmcrypt: True ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/group_vars/all index 29e82024c7a7e..ab0b20c9e6ad8 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/group_vars/all @@ -2,7 +2,7 @@ dmcrypt: True ceph_dev: True -cluster: test +cluster: ceph public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1