debug

debug

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

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 9f8f200fe2c81fa0e967940bfcde996173a5363a..784ccaf2eee59cdc5ccca1375ab405becb4288c4 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -16,7 +16,7 @@ ceph_conf_overrides:
   global:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
-openstack_config: True
+openstack_config: False
 openstack_glance_pool:
   name: "images"
   pg_num: "{{ osd_pool_default_pg_num }}"
@@ -43,4 +43,5 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 mds_max_mds: 2
 dashboard_admin_password: $sX!cD$rYU6qR^B!
-grafana_admin_password: +xFRe+RES@7vg24n
\ No newline at end of file
+grafana_admin_password: +xFRe+RES@7vg24n
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/all_daemons/container/group_vars/mons b/tests/functional/all_daemons/container/group_vars/mons
index 7b31aa92243f1d2a5f8e41244fddb00646231df1..f7f379242f77bcc0814d43dffb3239788581da6c 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/mons
+++ b/tests/functional/all_daemons/container/group_vars/mons
@@ -1,6 +1,6 @@
 ---
-create_crush_tree: True
-crush_rule_config: True
+create_crush_tree: False
+crush_rule_config: False
 crush_rule_hdd:
   name: HDD
   root: default

diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts
index b4882e58e12ded145bfe20bd51c45f138630ef36..ce08fffe15e4fc9c89428511da4385686b8c5519 100644 (file)
--- a/tests/functional/all_daemons/container/hosts
+++ b/tests/functional/all_daemons/container/hosts
@@ -1,35 +1,35 @@
 [mons]
 mon0 monitor_address=192.168.17.10
-mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
-mon2 monitor_address=192.168.17.12
+#mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+#mon2 monitor_address=192.168.17.12
 
 [mgrs]
 mgr0
 
-[osds]
-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
-osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
-
-[mdss]
-mds0
-mds1
-mds2
-
-[rgws]
-rgw0
-
-#[nfss]
-#nfs0
-
+#[osds]
+#osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
+#osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
+
+#[mdss]
+#mds0
+#mds1
+#mds2
+#
+#[rgws]
+#rgw0
+#
+##[nfss]
+##nfs0
+#
 [clients]
 client0
 client1
-
-[rbdmirrors]
-rbd-mirror0
-
-[iscsigws]
-iscsi-gw0
-
-[grafana-server]
-mon0
\ No newline at end of file
+#
+#[rbdmirrors]
+#rbd-mirror0
+#
+#[iscsigws]
+#iscsi-gw0
+#
+#[grafana-server]
+#mon0
\ No newline at end of file

diff --git a/tests/functional/all_daemons/container/vagrant_variables.yml b/tests/functional/all_daemons/container/vagrant_variables.yml
index fbb28610998acdb8bb8155d426b312d117474b8c..1b9954eb683425c77ba1b782a003ddb1b267ff9e 100644 (file)
--- a/tests/functional/all_daemons/container/vagrant_variables.yml
+++ b/tests/functional/all_daemons/container/vagrant_variables.yml
@@ -4,15 +4,15 @@
 docker: True
 
 # DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 3
-osd_vms: 2
-mds_vms: 3
-rgw_vms: 1
+mon_vms: 1
+osd_vms: 0
+mds_vms: 0
+rgw_vms: 0
 nfs_vms: 0
 grafana_server_vms: 0
-rbd_mirror_vms: 1
+rbd_mirror_vms: 0
 client_vms: 2
-iscsi_gw_vms: 1
+iscsi_gw_vms: 0
 mgr_vms: 1
 
 # SUBNETS TO USE FOR THE VMS

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 1569965847cbb6bdd0e31bd9843847c4e8e415a4..2dac5bd0d21b7e6d35cd0140656f5919e762cba5 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -8,7 +8,7 @@ ceph_conf_overrides:
   global:
     mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
-openstack_config: True
+openstack_config: False
 openstack_glance_pool:
   name: "images"
   pg_num: "{{ osd_pool_default_pg_num }}"
@@ -36,4 +36,5 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 mds_max_mds: 2
 dashboard_admin_password: $sX!cD$rYU6qR^B!
-grafana_admin_password: +xFRe+RES@7vg24n
\ No newline at end of file
+grafana_admin_password: +xFRe+RES@7vg24n
+dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/all_daemons/group_vars/mons b/tests/functional/all_daemons/group_vars/mons
index f6ab9a5415ec4a83aff670e1fcbd94d55ca1cbec..954f7f7f4648df5c82ef5332fe65a8e8846b6e6d 100644 (file)
--- a/tests/functional/all_daemons/group_vars/mons
+++ b/tests/functional/all_daemons/group_vars/mons
@@ -1,6 +1,6 @@
 ---
-create_crush_tree: True
-crush_rule_config: True
+create_crush_tree: False
+crush_rule_config: False
 crush_rule_hdd:
   name: HDD
   root: default

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index f0793d95d241c266825da1fd94db0c14797c6ce2..b031023872dfe3c2cedf7b93da91c7a680be9889 100644 (file)
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -1,22 +1,22 @@
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
-mon2 monitor_address=192.168.1.12
+#mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+#mon2 monitor_address=192.168.1.12
 
 [mgrs]
 mgr0
 
-[osds]
-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
-osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
+#[osds]
+#osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
+#osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
 
-[mdss]
-mds0
-mds1
-mds2
+#[mdss]
+#mds0
+#mds1
+#mds2
 
-[rgws]
-rgw0
+#[rgws]
+#rgw0
 
 [clients]
 client0
@@ -25,11 +25,11 @@ client1
 #[nfss]
 #nfs0
 
-[rbdmirrors]
-rbd-mirror0
+#[rbdmirrors]
+#rbd-mirror0
 
-[iscsigws]
-iscsi-gw0 ceph_repository="dev"
+#[iscsigws]
+#iscsi-gw0 ceph_repository="dev"
 
-[grafana-server]
-mon0
\ No newline at end of file
+#[grafana-server]
+#mon0
\ No newline at end of file

diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index 24824a6644ae084a3b068e71583127781d995360..163a1a513647d90cbcc26c874adeee38a259cbfc 100644 (file)
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -4,15 +4,15 @@
 docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 3
-osd_vms: 2
-mds_vms: 3
-rgw_vms: 1
+mon_vms: 1
+osd_vms: 0
+mds_vms: 0
+rgw_vms: 0
 nfs_vms: 0
 grafana_server_vms: 0
-rbd_mirror_vms: 1
+rbd_mirror_vms: 0
 client_vms: 2
-iscsi_gw_vms: 1
+iscsi_gw_vms: 0
 mgr_vms: 1
 
 # INSTALL SOURCE OF CEPH