subset-debug-6.0

debug

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

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 69e021238e7865585e8b6bc432b15d1c4f00b951..1392c138d14604c59e77e7a0b7e39e8a50ca3221 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -3,7 +3,7 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.1.0/24"
 cluster_network: "192.168.2.0/24"
-radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
+#radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_conf_overrides:
   global:
     mon_allow_pool_size_one: true

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index 4fe0c97cea471842d55f9339812154cc2e05787c..4520a033adc5bec75db9bfb696668b3bacd22a64 100644 (file)
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -17,7 +17,8 @@ mds1
 mds2
 
 [rgws]
-rgw0
+rgw0 radosgw_interface=eth1
+rgw1 radosgw_interface=eth1
 
 [clients]
 client0

diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index 7da2da79d9bec9265c9eee76a97d18108d8be8d3..0c525ddd2df77264460a2575b583a8eb6fd2ffe8 100644 (file)
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -7,7 +7,7 @@ docker: false
 mon_vms: 3
 osd_vms: 3
 mds_vms: 3
-rgw_vms: 1
+rgw_vms: 2
 nfs_vms: 1
 grafana_server_vms: 0
 rbd_mirror_vms: 1

diff --git a/tests/functional/subset_update/group_vars/all b/tests/functional/subset_update/group_vars/all
index a107e33d25b39c6f4f5618a164457bae5fbf3141..280d5d292dcf50e579199c3c4e38cd5b73ddbe03 100644 (file)
--- a/tests/functional/subset_update/group_vars/all
+++ b/tests/functional/subset_update/group_vars/all
@@ -3,7 +3,7 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.3.0/24"
 cluster_network: "192.168.4.0/24"
-radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
+#radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"
 ceph_conf_overrides:
   global:
     auth_allow_insecure_global_id_reclaim: false

diff --git a/tests/functional/subset_update/hosts b/tests/functional/subset_update/hosts
index 18669ec1dbfdec1ce3c10fa4a96667f25a7d4051..cc7bdcd686e4c752d9b677f016bd3f9b1bd7b097 100644 (file)
--- a/tests/functional/subset_update/hosts
+++ b/tests/functional/subset_update/hosts
@@ -13,6 +13,6 @@ osd1
 osd2
 
 [rgws]
-rgw0
-rgw1
+rgw0 radosgw_address=192.168.3.13
+rgw1 radosgw_address=192.168.3.14