]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c1eb7b9)
ceph-volume: do not test custom cluster names with simple 20350/head
authorAndrew Schoen <aschoen@redhat.com>
Tue, 6 Feb 2018 17:36:03 +0000 (11:36 -0600)
committerAndrew Schoen <aschoen@redhat.com>
Wed, 7 Feb 2018 14:46:51 +0000 (08:46 -0600)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 63046e0d7bd05a42477dd1fbd4af11f81046b08d)

12 files changed:
src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/activate/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-luks/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/centos7/bluestore/dmcrypt-plain/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-luks/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/dmcrypt-plain/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/activate/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-luks/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/xenial/bluestore/dmcrypt-plain/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/activate/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-luks/group_vars/all patch | blob | history
src/ceph-volume/ceph_volume/tests/functional/simple/xenial/filestore/dmcrypt-plain/group_vars/all patch | blob | history

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 560c8b03b172b5c71a1efcd69802fc15742de72b..4fa4035ed4d51712d110e4e69d8a4fc76da822c9 100644 (file)
--- 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 83d24e0a0135afbf30847448f6f1cd2967106a6e..3c91f840f38bf37914b98b07fced39bb0a2e1427 100644 (file)
--- 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 674abc9390ce34b41a18da2d9903ce0d74707e5e..75dadacaf1e37837c3c9edf3da23f4762d8b4ecd 100644 (file)
--- 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 8902bdda37e9632c77ca1abc81c435e0d07eaf7b..37a20cff6858e7735e8b35b2b7bcb1340b435012 100644 (file)
--- 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 c8ba0ba4c08b2d00b1df746eace86ab2449af35f..2e93089d8c8a5bd8953640111a7911fcaf3e4ea3 100644 (file)
--- 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 29e82024c7a7ead721f7cab446976585de5aaa5c..ab0b20c9e6ad84d4abd16ed368f5d3c5feac75fb 100644 (file)
--- 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 560c8b03b172b5c71a1efcd69802fc15742de72b..4fa4035ed4d51712d110e4e69d8a4fc76da822c9 100644 (file)
--- 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 83d24e0a0135afbf30847448f6f1cd2967106a6e..3c91f840f38bf37914b98b07fced39bb0a2e1427 100644 (file)
--- 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 674abc9390ce34b41a18da2d9903ce0d74707e5e..75dadacaf1e37837c3c9edf3da23f4762d8b4ecd 100644 (file)
--- 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 8902bdda37e9632c77ca1abc81c435e0d07eaf7b..37a20cff6858e7735e8b35b2b7bcb1340b435012 100644 (file)
--- 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 c8ba0ba4c08b2d00b1df746eace86ab2449af35f..2e93089d8c8a5bd8953640111a7911fcaf3e4ea3 100644 (file)
--- 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 29e82024c7a7ead721f7cab446976585de5aaa5c..ab0b20c9e6ad84d4abd16ed368f5d3c5feac75fb 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.