From 3ab89ab48cb1634d7d2aa664008e632f994accc4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 7 Mar 2018 17:28:20 +0100 Subject: [PATCH] ci: re-arrange group_vars files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We should stop putting everything in 'all'. This is too easy and this is error prone as well for those who are separating variables into host type, things that you should do. Signed-off-by: Sébastien Han --- .../centos/7/cluster/group_vars/all | 36 ++++--------------- .../centos/7/cluster/group_vars/clients | 20 +++++++++++ .../centos/7/cluster/group_vars/osds | 1 + .../7/docker-collocation/group_vars/all | 32 +++-------------- .../7/docker-collocation/group_vars/clients | 24 +++++++++++++ .../7/docker-collocation/group_vars/osds | 5 +++ .../functional/centos/7/docker/group_vars/all | 33 +++-------------- .../centos/7/docker/group_vars/clients | 24 +++++++++++++ .../centos/7/docker/group_vars/osds | 5 +++ 9 files changed, 93 insertions(+), 87 deletions(-) create mode 100644 tests/functional/centos/7/docker-collocation/group_vars/clients create mode 100644 tests/functional/centos/7/docker-collocation/group_vars/osds create mode 100644 tests/functional/centos/7/docker/group_vars/clients create mode 100644 tests/functional/centos/7/docker/group_vars/osds diff --git a/tests/functional/centos/7/cluster/group_vars/all b/tests/functional/centos/7/cluster/group_vars/all index 925155a35..2ac4acf39 100644 --- a/tests/functional/centos/7/cluster/group_vars/all +++ b/tests/functional/centos/7/cluster/group_vars/all @@ -1,5 +1,4 @@ --- - ceph_origin: repository ceph_repository: community cluster: test @@ -8,35 +7,6 @@ cluster_network: "192.168.2.0/24" journal_size: 100 radosgw_interface: eth1 osd_objectstore: filestore -devices: - - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - - '/dev/sdb' -dedicated_devices: - - '/dev/sdc' - - '/dev/sdc' -osd_scenario: non-collocated -os_tuning_params: - - { name: fs.file-max, value: 26234859 } -user_config: True -test: - name: "test" - pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - rule_name: "HDD" - type: "replicated" - erasure_profile: "" - size: "" -test2: - name: "test2" - pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - rule_name: "HDD" - type: "replicated" - erasure_profile: "" - size: "" -pools: - - "{{ test }}" - - "{{ test2 }}" ceph_conf_overrides: global: osd_pool_default_size: 1 @@ -44,3 +14,9 @@ nfs_ganesha_stable: true nfs_ganesha_dev: false nfs_ganesha_stable_branch: V2.5-stable nfs_ganesha_flavor: "ceph_master" +devices: + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' + - '/dev/sdb' +dedicated_devices: + - '/dev/sdc' + - '/dev/sdc' diff --git a/tests/functional/centos/7/cluster/group_vars/clients b/tests/functional/centos/7/cluster/group_vars/clients index d4627808d..2f5bb7fe2 100644 --- a/tests/functional/centos/7/cluster/group_vars/clients +++ b/tests/functional/centos/7/cluster/group_vars/clients @@ -3,3 +3,23 @@ copy_admin_key: true keys: - { name: client.test, key: "AQAin8tUoMPDGRAACcfAQHbq4eTuUoTCZdW1Uw==", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test", mode: "0600", acls: [] } - { name: client.test2, key: "AQAin8tUAJkGGhAA8WZ8Lz5c7IkT8QZ5s7bI1A==", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test2", mode: "0600", acls: [] } +user_config: True +test: + name: "test" + pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + rule_name: "HDD" + type: "replicated" + erasure_profile: "" + size: "" +test2: + name: "test2" + pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + rule_name: "HDD" + type: "replicated" + erasure_profile: "" + size: "" +pools: + - "{{ test }}" + - "{{ test2 }}" diff --git a/tests/functional/centos/7/cluster/group_vars/osds b/tests/functional/centos/7/cluster/group_vars/osds index aa159bba8..8f525f192 100644 --- a/tests/functional/centos/7/cluster/group_vars/osds +++ b/tests/functional/centos/7/cluster/group_vars/osds @@ -2,3 +2,4 @@ copy_admin_key: true os_tuning_params: - { name: fs.file-max, value: 26234859 } +osd_scenario: non-collocated diff --git a/tests/functional/centos/7/docker-collocation/group_vars/all b/tests/functional/centos/7/docker-collocation/group_vars/all index a58ea95e0..7ae0a37c9 100644 --- a/tests/functional/centos/7/docker-collocation/group_vars/all +++ b/tests/functional/centos/7/docker-collocation/group_vars/all @@ -10,39 +10,15 @@ radosgw_interface: eth1 ceph_mon_docker_subnet: "{{ public_network }}" journal_size: 100 ceph_docker_on_openstack: False +osd_objectstore: filestore public_network: "192.168.15.0/24" cluster_network: "192.168.16.0/24" -osd_scenario: collocated -osd_objectstore: filestore -# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above -ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 -devices: - - /dev/sda - - /dev/sdb -ceph_osd_docker_run_script_path: /var/tmp rgw_override_bucket_index_max_shards: 16 rgw_bucket_default_quota_max_objects: 1638400 ceph_conf_overrides: global: osd_pool_default_pg_num: 8 osd_pool_default_size: 1 -user_config: True -test: - name: "test" - pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - rule_name: "HDD" - type: "replicated" - erasure_profile: "" - size: "" -test2: - name: "test2" - pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - rule_name: "HDD" - type: "replicated" - erasure_profile: "" - size: "" -pools: - - "{{ test }}" - - "{{ test2 }}" +devices: + - /dev/sda + - /dev/sdb diff --git a/tests/functional/centos/7/docker-collocation/group_vars/clients b/tests/functional/centos/7/docker-collocation/group_vars/clients new file mode 100644 index 000000000..5999b330c --- /dev/null +++ b/tests/functional/centos/7/docker-collocation/group_vars/clients @@ -0,0 +1,24 @@ +--- +user_config: True +keys: + - { name: client.test, key: "AQAin8tUoMPDGRAACcfAQHbq4eTuUoTCZdW1Uw==", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test", mode: "0600", acls: [] } + - { name: client.test2, key: "AQAin8tUAJkGGhAA8WZ8Lz5c7IkT8QZ5s7bI1A==", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test2", mode: "0600", acls: [] } +test: + name: "test" + pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + rule_name: "HDD" + type: "replicated" + erasure_profile: "" + size: "" +test2: + name: "test2" + pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + rule_name: "HDD" + type: "replicated" + erasure_profile: "" + size: "" +pools: + - "{{ test }}" + - "{{ test2 }}" diff --git a/tests/functional/centos/7/docker-collocation/group_vars/osds b/tests/functional/centos/7/docker-collocation/group_vars/osds new file mode 100644 index 000000000..bbeff01f7 --- /dev/null +++ b/tests/functional/centos/7/docker-collocation/group_vars/osds @@ -0,0 +1,5 @@ +--- +ceph_osd_docker_run_script_path: /var/tmp +# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above +ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 +osd_scenario: collocated diff --git a/tests/functional/centos/7/docker/group_vars/all b/tests/functional/centos/7/docker/group_vars/all index fc8f6bece..795a76e02 100644 --- a/tests/functional/centos/7/docker/group_vars/all +++ b/tests/functional/centos/7/docker/group_vars/all @@ -10,39 +10,14 @@ radosgw_interface: eth1 ceph_mon_docker_subnet: "{{ public_network }}" journal_size: 100 ceph_docker_on_openstack: False +osd_objectstore: filestore public_network: "192.168.17.0/24" cluster_network: "192.168.18.0/24" -osd_scenario: collocated -ceph_rgw_civetweb_port: 8080 -osd_objectstore: filestore -# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above -ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 -devices: - - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - - /dev/sdb -ceph_osd_docker_run_script_path: /var/tmp rgw_override_bucket_index_max_shards: 16 rgw_bucket_default_quota_max_objects: 1638400 ceph_conf_overrides: global: osd_pool_default_size: 1 -user_config: True -test: - name: "test" - pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - rule_name: "HDD" - type: "replicated" - erasure_profile: "" - size: "" -test2: - name: "test2" - pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" - rule_name: "HDD" - type: "replicated" - erasure_profile: "" - size: "" -pools: - - "{{ test }}" - - "{{ test2 }}" +devices: + - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' + - /dev/sdb diff --git a/tests/functional/centos/7/docker/group_vars/clients b/tests/functional/centos/7/docker/group_vars/clients new file mode 100644 index 000000000..5999b330c --- /dev/null +++ b/tests/functional/centos/7/docker/group_vars/clients @@ -0,0 +1,24 @@ +--- +user_config: True +keys: + - { name: client.test, key: "AQAin8tUoMPDGRAACcfAQHbq4eTuUoTCZdW1Uw==", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test", mode: "0600", acls: [] } + - { name: client.test2, key: "AQAin8tUAJkGGhAA8WZ8Lz5c7IkT8QZ5s7bI1A==", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test2", mode: "0600", acls: [] } +test: + name: "test" + pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + rule_name: "HDD" + type: "replicated" + erasure_profile: "" + size: "" +test2: + name: "test2" + pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}" + rule_name: "HDD" + type: "replicated" + erasure_profile: "" + size: "" +pools: + - "{{ test }}" + - "{{ test2 }}" diff --git a/tests/functional/centos/7/docker/group_vars/osds b/tests/functional/centos/7/docker/group_vars/osds new file mode 100644 index 000000000..793d76bb0 --- /dev/null +++ b/tests/functional/centos/7/docker/group_vars/osds @@ -0,0 +1,5 @@ +--- +# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above +ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 +ceph_osd_docker_run_script_path: /var/tmp +osd_scenario: collocated -- 2.39.5