From: Andrew Schoen Date: Thu, 8 Feb 2018 13:09:57 +0000 (-0600) Subject: ceph-volume: use a custom cluster name in simple functional tests X-Git-Tag: v13.0.2~321^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20367%2Fhead;p=ceph.git ceph-volume: use a custom cluster name in simple functional tests 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 4fa4035ed4d51..560c8b03b172b 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: ceph +cluster: test 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 3c91f840f38bf..83d24e0a0135a 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: ceph +cluster: test 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 75dadacaf1e37..674abc9390ce3 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: ceph +cluster: test 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 37a20cff6858e..8902bdda37e96 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: ceph +cluster: test 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 2e93089d8c8a5..c8ba0ba4c08b2 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: ceph +cluster: test 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 ab0b20c9e6ad8..29e82024c7a7e 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: ceph +cluster: test 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 4fa4035ed4d51..560c8b03b172b 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: ceph +cluster: test 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 3c91f840f38bf..83d24e0a0135a 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: ceph +cluster: test 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 75dadacaf1e37..674abc9390ce3 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: ceph +cluster: test 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 37a20cff6858e..8902bdda37e96 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: ceph +cluster: test 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 2e93089d8c8a5..c8ba0ba4c08b2 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: ceph +cluster: test 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 ab0b20c9e6ad8..29e82024c7a7e 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: ceph +cluster: test public_network: "192.168.1.0/24" cluster_network: "192.168.2.0/24" monitor_interface: eth1