debug commit

dnm

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

diff --git a/site.yml.sample b/site.yml.sample
index 577e9d5206f1360a1f38936e4259cb90542c8cea..6706266ae55cae15436a97ece59c54e6c8f3dd97 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -60,6 +60,10 @@
       when:
         - not delegate_facts_host | bool or inventory_hostname in groups.get(client_group_name, [])
 
+    - name: debug
+      debug:
+        msg: "{{ groups['all'] | difference(groups.get('clients', [])) }}"
+
     - name: gather and delegate facts
       setup:
         gather_subset:

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 262969b54f0d9bb7ec527695c2429d8d636efd71..e5accf52af33b3269efa59ea258d6ee8d8f75d5d 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -7,7 +7,7 @@ radosgw_interface: eth1
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
-openstack_config: True
+openstack_config: false
 openstack_glance_pool:
   name: "images"
   pg_num: "{{ osd_pool_default_pg_num }}"

diff --git a/tests/functional/all_daemons/group_vars/mons b/tests/functional/all_daemons/group_vars/mons
index f6ab9a5415ec4a83aff670e1fcbd94d55ca1cbec..4a0a5803415483b9fd46cb3df29117e92503be61 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/group_vars/osds b/tests/functional/all_daemons/group_vars/osds
index e27c474223beeb57b3a5626aeeb52713fb355250..77f10f0aaaec00f154dab497885a931c0093415c 100644 (file)
--- a/tests/functional/all_daemons/group_vars/osds
+++ b/tests/functional/all_daemons/group_vars/osds
@@ -1,12 +1,3 @@
 ---
 os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
-osd_scenario: lvm
-osd_objectstore: "bluestore"
-lvm_volumes:
-  - data: data-lv1
-    data_vg: test_group
-  - data: data-lv2
-    data_vg: test_group
-    db: journal1
-    db_vg: journals
\ No newline at end of file

diff --git a/tests/functional/all_daemons/hosts-upgrade-to-nautilus b/tests/functional/all_daemons/hosts-upgrade-to-nautilus
index 40f8145d45588dd7556e050f13c2242a2b0cb7a3..085a1ec06c580dde5ede14ec86ac28e6f2acc912 100644 (file)
--- a/tests/functional/all_daemons/hosts-upgrade-to-nautilus
+++ b/tests/functional/all_daemons/hosts-upgrade-to-nautilus
@@ -7,33 +7,12 @@ mon2 monitor_address=192.168.1.12
 mgr0
 
 [osds]
-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
-osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
-osd2 osd_crush_location="{ 'root': 'default', 'host': 'osd2' }"
-
-[mdss]
-mds0
-mds1
-mds2
-
-[rgws]
-rgw0
-
-[clients]
-client0
-client1
-
-[nfss]
-nfs0
-
-[rbdmirrors]
-rbd-mirror0
-
-[iscsigws]
-iscsi-gw0
-
-[all:vars]
-nfs_ganesha_stable=True
-nfs_ganesha_dev=False
-nfs_ganesha_stable_branch="V2.7-stable"
-nfs_ganesha_flavor="ceph_master"
+osd0 osd_scenario="non-collocated" devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" osd_objectstore="bluestore"
+osd1 osd_scenario="non-collocated" devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" osd_objectstore="bluestore"
+osd2 osd_scenario="non-collocated" devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" osd_objectstore="bluestore"
+osd3 osd_scenario="non-collocated" devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" osd_objectstore="bluestore"
+osd4 osd_scenario="non-collocated" devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" osd_objectstore="bluestore"
+osd5 osd_scenario="non-collocated" devices="['/dev/sda']" dedicated_devices="['/dev/sdc']" osd_objectstore="filestore"
+osd6 osd_scenario="non-collocated" devices="['/dev/sda']" dedicated_devices="['/dev/sdc']" osd_objectstore="filestore"
+osd7 osd_scenario="non-collocated" devices="['/dev/sda']" dedicated_devices="['/dev/sdc']" osd_objectstore="filestore"
+osd8 osd_scenario="non-collocated" devices="['/dev/sda']" dedicated_devices="['/dev/sdc']" osd_objectstore="filestore"

diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index e3ab3a63356f49833cacff90ad57c06b557f17da..a06e4f3ae178f2f976025552d7e94479bd47068c 100644 (file)
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -5,14 +5,14 @@ docker: false
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 3
-osd_vms: 2
-mds_vms: 3
-rgw_vms: 1
-nfs_vms: 1
-rbd_mirror_vms: 1
-client_vms: 2
-iscsi_gw_vms: 1
-mgr_vms: 1
+osd_vms: 6
+mds_vms: 0
+rgw_vms: 0
+nfs_vms: 0
+rbd_mirror_vms: 0
+client_vms: 0
+iscsi_gw_vms: 0
+mgr_vms: 0
 
 # INSTALL SOURCE OF CEPH
 # valid values are 'stable' and 'dev'