tests: rename all nodes name

remove the 'ceph-' prefix in order to have the same names in all
branches.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index 8b193dcfec33227019317c1faf67d73e66e28764..ab8d0bab36beefd251a45e775219e5636a0a3a67 100644 (file)
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -1,30 +1,30 @@
 [mons]
-ceph-mon0 monitor_address=192.168.1.10
-ceph-mon1 monitor_interface=eth1
-ceph-mon2 monitor_address=192.168.1.12
+mon0 monitor_address=192.168.1.10
+mon1 monitor_interface=eth1
+mon2 monitor_address=192.168.1.12
 
 [mgrs]
-ceph-mgr0
+mgr0
 
 [osds]
-ceph-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'ceph-osd0' }"
-ceph-osd1 osd_crush_location="{ 'root': 'default', 'host': 'ceph-osd1' }"
+osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
+osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
 
 [mdss]
-ceph-mds0
+mds0
 
 [rgws]
-ceph-rgw0
+rgw0
 
 [clients]
-ceph-client0
-ceph-client1
+client0
+client1
 
 [nfss]
-ceph-nfs0
+nfs0
 
 [rbdmirrors]
-ceph-rbd-mirror0
+rbd-mirror0
 
 [iscsigws]
-ceph-iscsi-gw0 ceph_repository="dev"
+iscsi-gw0 ceph_repository="dev"

diff --git a/tests/functional/all_daemons/hosts-switch-to-containers b/tests/functional/all_daemons/hosts-switch-to-containers
index 85f592c423fde32a73bebae62fb865b2bb379d02..12c6cd72bfd15d49f4bc0b7db984558af48d8e03 100644 (file)
--- a/tests/functional/all_daemons/hosts-switch-to-containers
+++ b/tests/functional/all_daemons/hosts-switch-to-containers
@@ -2,21 +2,21 @@
 docker=True
 
 [mons]
-ceph-mon0 monitor_address=192.168.1.10
-ceph-mon1 monitor_interface=eth1
-ceph-mon2 monitor_address=192.168.1.12
+mon0 monitor_address=192.168.1.10
+mon1 monitor_interface=eth1
+mon2 monitor_address=192.168.1.12
 
 [osds]
-ceph-osd0
+osd0
 
 [mdss]
-ceph-mds0
+mds0
 
 [rgws]
-ceph-rgw0
+rgw0
 
 [clients]
-ceph-client0
+client0
 
 [mgrs]
-ceph-mgr0
+mgr0

diff --git a/tests/functional/all_daemons/hosts-ubuntu b/tests/functional/all_daemons/hosts-ubuntu
index 72285940a33814686408f467efa62c054d7d2334..3fadce04fe37a3f6ce6a293752b843f12f35c6a6 100644 (file)
--- a/tests/functional/all_daemons/hosts-ubuntu
+++ b/tests/functional/all_daemons/hosts-ubuntu
@@ -1,27 +1,27 @@
 [mons]
-ceph-mon0 monitor_address=192.168.1.10
-ceph-mon1 monitor_interface=eth1
-ceph-mon2 monitor_address=192.168.1.12
+mon0 monitor_address=192.168.1.10
+mon1 monitor_interface=eth1
+mon2 monitor_address=192.168.1.12
 
 [mgrs]
-ceph-mgr0
+mgr0
 
 [osds]
-ceph-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'ceph-osd0' }"
-ceph-osd1 osd_crush_location="{ 'root': 'default', 'host': 'ceph-osd1' }"
+osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
+osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
 
 [mdss]
-ceph-mds0
+mds0
 
 [rgws]
-ceph-rgw0
+rgw0
 
 [clients]
-ceph-client0
-ceph-client1
+client0
+client1
 
 [nfss]
-ceph-nfs0
+nfs0
 
 [rbdmirrors]
-ceph-rbd-mirror0
+rbd-mirror0

diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index 1e062066a78de35abe2722e48a158a645cd479e9..50140b605dbea23f53a635fc25d43f2d7af37e4a 100644 (file)
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -73,4 +73,4 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 
 # VM prefix name, need to match the hostname
-label_prefix: ceph
+# label_prefix: ceph

diff --git a/tests/functional/shrink_osd/hosts b/tests/functional/shrink_osd/hosts
index d3b2c1f819fc9cbb828038ed515b3148ceb4891c..3ef2fc31124f320bfa6174c4ffef514952497e36 100644 (file)
--- a/tests/functional/shrink_osd/hosts
+++ b/tests/functional/shrink_osd/hosts
@@ -1,10 +1,10 @@
 [mons]
-ceph-mon0 monitor_address=192.168.71.10
+mon0 monitor_address=192.168.71.10
 
 [mgrs]
-ceph-mon0
+mon0
 
 [osds]
-ceph-osd0
-ceph-osd1
-ceph-osd2
+osd0
+osd1
+osd2

diff --git a/tests/functional/shrink_osd/vagrant_variables.yml b/tests/functional/shrink_osd/vagrant_variables.yml
index 768b7b7ebd61e5bbe508d8f50cae1f458d687bc6..1cbe552ca242cdb8b43a6b5e2a4814811d880ee5 100644 (file)
--- a/tests/functional/shrink_osd/vagrant_variables.yml
+++ b/tests/functional/shrink_osd/vagrant_variables.yml
@@ -73,4 +73,4 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 
 # VM prefix name, need to match the hostname
-label_prefix: ceph
+# label_prefix: ceph