Tests: update tests according to ipv6 support

Since ceph.conf.j2 has been updated to add ipv6 support, the different
variables in many scenarios need to be updated.

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

diff --git a/tests/functional/centos/7/cluster/group_vars/all b/tests/functional/centos/7/cluster/group_vars/all
index 5c82ee74e3272f0b7fe481d55fa57ab412d1952d..d13902a7773afed7a9e903e6c66a0cfd8ba39f94 100644 (file)
--- a/tests/functional/centos/7/cluster/group_vars/all
+++ b/tests/functional/centos/7/cluster/group_vars/all
@@ -4,6 +4,7 @@ ceph_stable: True
 cluster: test
 public_network: "192.168.1.0/24"
 cluster_network: "192.168.2.0/24"
+monitor_interface: eth1
 journal_size: 100
 devices:
   - '/dev/sda'

diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all b/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all
index ec2b5d6024fb2f4f669dc1dbf4e797d3bebc32e7..f5356b161e9a5a0960eb43fa2d264ddfe69f4008 100644 (file)
--- a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all
+++ b/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all
@@ -4,6 +4,7 @@ ceph_stable: True
 public_network: "192.168.11.0/24"
 cluster_network: "192.168.12.0/24"
 journal_size: 100
+monitor_interface: eth1
 dmcrypt_dedicated_journal: true
 devices:
   - '/dev/sda'

diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/hosts b/tests/functional/centos/7/dmcrypt-dedicated-journal/hosts
index 89721c03ec6ef1358edf8d06b599e37dbe08c925..f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3 100644 (file)
--- a/tests/functional/centos/7/dmcrypt-dedicated-journal/hosts
+++ b/tests/functional/centos/7/dmcrypt-dedicated-journal/hosts
@@ -1,5 +1,5 @@
 [mons]
-mon0 monitor_interface=eth1
+mon0
 
 [osds]
 osd0

diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all b/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all
index f1998acbb8ede0f846479f3f2fa412ba5bb18b46..0795478a93a2c15ec40e381492cfbcc59cef0b9a 100644 (file)
--- a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all
+++ b/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all
@@ -4,6 +4,7 @@ ceph_stable: True
 public_network: "192.168.13.0/24"
 cluster_network: "192.168.14.0/24"
 journal_size: 100
+monitor_interface: eth1
 dmcrypt_journal_collocation: true
 devices:
   - '/dev/sda'

diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/hosts b/tests/functional/centos/7/dmcrypt-journal-collocation/hosts
index 89721c03ec6ef1358edf8d06b599e37dbe08c925..f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3 100644 (file)
--- a/tests/functional/centos/7/dmcrypt-journal-collocation/hosts
+++ b/tests/functional/centos/7/dmcrypt-journal-collocation/hosts
@@ -1,5 +1,5 @@
 [mons]
-mon0 monitor_interface=eth1
+mon0
 
 [osds]
 osd0

diff --git a/tests/functional/centos/7/journal-collocation/group_vars/all b/tests/functional/centos/7/journal-collocation/group_vars/all
index 81857e670f85b600d74a05b276abc72ea9fa8af1..c8ddf66cbda474a39fa6afe1568b2d087348eaf8 100644 (file)
--- a/tests/functional/centos/7/journal-collocation/group_vars/all
+++ b/tests/functional/centos/7/journal-collocation/group_vars/all
@@ -4,6 +4,7 @@ ceph_stable: True
 cluster: test
 public_network: "192.168.3.0/24"
 cluster_network: "192.168.4.0/24"
+monitor_interface: eth1
 journal_size: 100
 devices:
   - '/dev/sda'

diff --git a/tests/functional/centos/7/journal-collocation/hosts b/tests/functional/centos/7/journal-collocation/hosts
index 89721c03ec6ef1358edf8d06b599e37dbe08c925..f6a265ab3e5d6093f9a7ed71fefc9358d8d0a8a3 100644 (file)
--- a/tests/functional/centos/7/journal-collocation/hosts
+++ b/tests/functional/centos/7/journal-collocation/hosts
@@ -1,5 +1,5 @@
 [mons]
-mon0 monitor_interface=eth1
+mon0
 
 [osds]
 osd0

diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all
index 0c66fe012e52a3dce01fe8d06505be96fa030623..a90958343075d125866ae9e2bc66d2cf5a72be2a 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/group_vars/all
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/all
@@ -4,6 +4,7 @@ ceph_stable: True
 cluster: test
 public_network: "192.168.5.0/24"
 cluster_network: "192.168.6.0/24"
+monitor_interface: eth1
 journal_size: 100
 devices:
   - '/dev/sdb'

diff --git a/tests/functional/ubuntu/16.04/cluster/hosts b/tests/functional/ubuntu/16.04/cluster/hosts
index 1b367310207e6bab4dd0fc1ebc83eca5e0d8b113..dfe4ef817c968dfb0c267a9744e4e6a0852f476e 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/hosts
+++ b/tests/functional/ubuntu/16.04/cluster/hosts
@@ -1,7 +1,7 @@
 [mons]
 mon0 monitor_address=192.168.5.10
 mon1 monitor_address=192.168.5.11
-mon2 monitor_interface=eth1
+mon2 monitor_address=192.168.5.12
 
 [osds]
 osd0