tests: rename all node

let's name all node the same way to avoid confusion.

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

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index c005b73166d06655783a43454d27b5beac2f41a7..86b1c014ecb1daf8d25e24193adc80b96be452ba 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
 
 [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"
 
 [all:vars]
 nfs_ganesha_stable=True

diff --git a/tests/functional/all_daemons/hosts-switch-to-containers b/tests/functional/all_daemons/hosts-switch-to-containers
index f1aee948c02a0cd43185eda5420bda7f34f9370b..d72da6b7b4ba0226a33759716b7ee6cad78be1ac 100644 (file)
--- a/tests/functional/all_daemons/hosts-switch-to-containers
+++ b/tests/functional/all_daemons/hosts-switch-to-containers
@@ -2,18 +2,18 @@
 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

diff --git a/tests/functional/all_daemons/hosts-ubuntu b/tests/functional/all_daemons/hosts-ubuntu
index f261aa83ee76220f58f765337e8b309d02d24d87..e9bd37682453d47f48371e168201796059c3813b 100644 (file)
--- a/tests/functional/all_daemons/hosts-ubuntu
+++ b/tests/functional/all_daemons/hosts-ubuntu
@@ -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
 
 [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"
 
 [all:vars]
 debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse']

diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index d73d4cfb8c815d2e81e564561a08ae3a5ecdd3af..c1301ed307eff76ed442b20fa84fa93a13002b75 100644 (file)
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -70,4 +70,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_mon/hosts b/tests/functional/shrink_mon/hosts
index c6b1db68857a0fce8bfb7e25ade477affc485b90..b2631e0834f7b28c73e2e4f419a0d57b4a5d6243 100644 (file)
--- a/tests/functional/shrink_mon/hosts
+++ b/tests/functional/shrink_mon/hosts
@@ -1,7 +1,7 @@
 [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
\ No newline at end of file
+osd0
\ No newline at end of file

diff --git a/tests/functional/shrink_mon/hosts-switch-to-containers b/tests/functional/shrink_mon/hosts-switch-to-containers
index f1aee948c02a0cd43185eda5420bda7f34f9370b..d72da6b7b4ba0226a33759716b7ee6cad78be1ac 100644 (file)
--- a/tests/functional/shrink_mon/hosts-switch-to-containers
+++ b/tests/functional/shrink_mon/hosts-switch-to-containers
@@ -2,18 +2,18 @@
 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

diff --git a/tests/functional/shrink_mon/hosts-ubuntu b/tests/functional/shrink_mon/hosts-ubuntu
index f261aa83ee76220f58f765337e8b309d02d24d87..eebaf4e8e57034304127e19a5726886ef39fef85 100644 (file)
--- a/tests/functional/shrink_mon/hosts-ubuntu
+++ b/tests/functional/shrink_mon/hosts-ubuntu
@@ -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
 
 [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
+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"
 
 [all:vars]
 debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse']

diff --git a/tests/functional/shrink_mon/vagrant_variables.yml b/tests/functional/shrink_mon/vagrant_variables.yml
index 2d82b94ab8b8f41c84a0b8c6c5a08c39473c771c..826f25c0b4f3b7fd6360acca644e8732a6ed4e8e 100644 (file)
--- a/tests/functional/shrink_mon/vagrant_variables.yml
+++ b/tests/functional/shrink_mon/vagrant_variables.yml
@@ -70,4 +70,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 13fd8d478989c6a949a2771d9756a3044123c32c..997e8108dbf9684d486b20e787081bbe3ad2912d 100644 (file)
--- a/tests/functional/shrink_osd/hosts
+++ b/tests/functional/shrink_osd/hosts
@@ -1,7 +1,7 @@
 [mons]
-ceph-mon0 monitor_address=192.168.71.10
+mon0 monitor_address=192.168.71.10
 
 [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 ef42fdb22306a4e695c9c19df376fe47ca65e79e..3d2771563d40e09904202342327f8142b817e1e9 100644 (file)
--- a/tests/functional/shrink_osd/vagrant_variables.yml
+++ b/tests/functional/shrink_osd/vagrant_variables.yml
@@ -70,4 +70,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/tox.ini b/tox.ini
index 6d1c676f26bcc7379096805209ca72d5541748c9..a0b5dfbb1eea70c657c845140d60c308ca56e505 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -123,7 +123,7 @@ commands=
   cp {toxinidir}/infrastructure-playbooks/shrink-mon.yml {toxinidir}/shrink-mon.yml
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/shrink-mon.yml --extra-vars "\
       ireallymeanit=yes \
-      mon_to_kill={env:MON_TO_KILL:ceph-mon2} \
+      mon_to_kill={env:MON_TO_KILL:mon2} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \
   "
 [shrink-osd]