From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 21 Jun 2017 12:14:35 +0000 (+0200)
Subject: Tests: update tests according to ipv6 support
X-Git-Tag: v2.3.0rc2~14^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2a52d5b555932346eb15e7d3b62303bf3a4c53c0;p=ceph-ansible.git

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 5c82ee74e..d13902a77 100644
--- 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 ec2b5d602..f5356b161 100644
--- 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 89721c03e..f6a265ab3 100644
--- 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 f1998acbb..0795478a9 100644
--- 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 89721c03e..f6a265ab3 100644
--- 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 81857e670..c8ddf66cb 100644
--- 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 89721c03e..f6a265ab3 100644
--- 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 0c66fe012..a90958343 100644
--- 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 1b3673102..dfe4ef817 100644
--- 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