From fc5807003b01e6d009c392e0577765582db53d64 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 6 Feb 2018 11:36:03 -0600 Subject: [PATCH] ceph-volume: do not test custom cluster names with simple Signed-off-by: Andrew Schoen (cherry picked from commit 63046e0d7bd05a42477dd1fbd4af11f81046b08d) --- .../functional/simple/centos7/bluestore/activate/group_vars/all | 2 +- .../simple/centos7/bluestore/dmcrypt-luks/group_vars/all | 2 +- .../simple/centos7/bluestore/dmcrypt-plain/group_vars/all | 2 +- .../functional/simple/centos7/filestore/activate/group_vars/all | 2 +- .../simple/centos7/filestore/dmcrypt-luks/group_vars/all | 2 +- .../simple/centos7/filestore/dmcrypt-plain/group_vars/all | 2 +- .../functional/simple/xenial/bluestore/activate/group_vars/all | 2 +- .../simple/xenial/bluestore/dmcrypt-luks/group_vars/all | 2 +- .../simple/xenial/bluestore/dmcrypt-plain/group_vars/all | 2 +- .../functional/simple/xenial/filestore/activate/group_vars/all | 2 +- .../simple/xenial/filestore/dmcrypt-luks/group_vars/all | 2 +- .../simple/xenial/filestore/dmcrypt-plain/group_vars/all | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) 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 560c8b03b172..4fa4035ed4d5 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 83d24e0a0135..3c91f840f38b 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 674abc9390ce..75dadacaf1e3 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 8902bdda37e9..37a20cff6858 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 c8ba0ba4c08b..2e93089d8c8a 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 29e82024c7a7..ab0b20c9e6ad 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 560c8b03b172..4fa4035ed4d5 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 83d24e0a0135..3c91f840f38b 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 674abc9390ce..75dadacaf1e3 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 8902bdda37e9..37a20cff6858 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 c8ba0ba4c08b..2e93089d8c8a 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 29e82024c7a7..ab0b20c9e6ad 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 -- 2.47.3