tests: fix cluster health status

The current ceph cluster health is in warning state:

health: HEALTH_WARN
        13 pool(s) have no replicas configured
        2 pool(s) have non-power-of-two pg_num

Because we're using only 1 replica then we need to disable the redundancy
check.
The pool pg num should be a power of two number (like 16).

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all
index 99ef186333afdee93bd06d61c30c35a92adeccf8..cd0e934d3a796be49d9bf89c1a2fff1c9cc63c4d 100644 (file)
--- a/tests/functional/add-mdss/container/group_vars/all
+++ b/tests/functional/add-mdss/container/group_vars/all
@@ -23,6 +23,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-mdss/group_vars/all b/tests/functional/add-mdss/group_vars/all
index a04c2b3f22f4cc51982af4dc34815650191a1d04..cbfbce0ec27b09c0b541e87bf8f83508716c0275 100644 (file)
--- a/tests/functional/add-mdss/group_vars/all
+++ b/tests/functional/add-mdss/group_vars/all
@@ -21,5 +21,6 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all
index 8f38b036945a7f4833f9804843c06d4200bdf24d..10fa7c9d7e222ac21883fa8d432cd4bfb43977a8 100644 (file)
--- a/tests/functional/add-mgrs/container/group_vars/all
+++ b/tests/functional/add-mgrs/container/group_vars/all
@@ -24,6 +24,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-mgrs/group_vars/all b/tests/functional/add-mgrs/group_vars/all
index 62f4bd40adc9e196947f7fd37ce718356e0f0da1..46cc24fd76319f0c2ed06bec9ad16f1311bf7c2e 100644 (file)
--- a/tests/functional/add-mgrs/group_vars/all
+++ b/tests/functional/add-mgrs/group_vars/all
@@ -22,5 +22,6 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all
index 59f694283cb487628486c24b4b9358ebe504650e..2c3d741153d3a00eeb2228636096fac306430806 100644 (file)
--- a/tests/functional/add-mons/container/group_vars/all
+++ b/tests/functional/add-mons/container/group_vars/all
@@ -24,6 +24,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-mons/group_vars/all b/tests/functional/add-mons/group_vars/all
index 410a60c2b10a80d1a203f4169b24c797bca83203..364a234bbb0365dbb37e3de272f19b42ce26850d 100644 (file)
--- a/tests/functional/add-mons/group_vars/all
+++ b/tests/functional/add-mons/group_vars/all
@@ -22,5 +22,6 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index 1c034763c056916e8e880144083582ed13501854..247ebd9af0111105696cc085621baba0a8325b5a 100644 (file)
--- a/tests/functional/add-osds/container/group_vars/all
+++ b/tests/functional/add-osds/container/group_vars/all
@@ -23,6 +23,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-osds/group_vars/all b/tests/functional/add-osds/group_vars/all
index 663a4b1d07bdebef39a493265376258c88fc8049..479e5dc4f7de1f2f28f5a04d6fd36278013a5dd7 100644 (file)
--- a/tests/functional/add-osds/group_vars/all
+++ b/tests/functional/add-osds/group_vars/all
@@ -21,5 +21,6 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all
index bdaad7a6ad3728c036f852854b57cf0e01da9bd7..905b0e89a41a492c136d080ba4a9954c18e284e5 100644 (file)
--- a/tests/functional/add-rbdmirrors/container/group_vars/all
+++ b/tests/functional/add-rbdmirrors/container/group_vars/all
@@ -24,6 +24,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-rbdmirrors/group_vars/all b/tests/functional/add-rbdmirrors/group_vars/all
index 7bf0324e86dac446c507bd38c3d6393a2b5d0148..ee78be5ef13ad7c089b21f0af6d2203dfd3d28c0 100644 (file)
--- a/tests/functional/add-rbdmirrors/group_vars/all
+++ b/tests/functional/add-rbdmirrors/group_vars/all
@@ -22,5 +22,6 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all
index 705cfca71b237acfef953ec1721e9b96360956a6..6c205069128f853ca644559860782a52a2519363 100644 (file)
--- a/tests/functional/add-rgws/container/group_vars/all
+++ b/tests/functional/add-rgws/container/group_vars/all
@@ -24,6 +24,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 rgw_override_bucket_index_max_shards: 16

diff --git a/tests/functional/add-rgws/group_vars/all b/tests/functional/add-rgws/group_vars/all
index 819b3bbd04e8f55eac29bc4b415e6ec898c8336e..0171a8fff7e34aab8b96929c2f435f7178afd0a2 100644 (file)
--- a/tests/functional/add-rgws/group_vars/all
+++ b/tests/functional/add-rgws/group_vars/all
@@ -22,5 +22,6 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/add-rgws/group_vars/rgws b/tests/functional/add-rgws/group_vars/rgws
index a882543144ab13e008ffb46a7cd2ea0061459711..29f5f8b2d29c519736bae8d47b0848b795603e2e 100644 (file)
--- a/tests/functional/add-rgws/group_vars/rgws
+++ b/tests/functional/add-rgws/group_vars/rgws
@@ -1,8 +1,8 @@
 copy_admin_key: true
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
+    pg_num: 16
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400

diff --git a/tests/functional/all_daemons/ceph-override.json b/tests/functional/all_daemons/ceph-override.json
index 2398f5b5fc672e78be58a34a500c94eb6ab962ba..e3a1865fb2304122e986a73d81d2cc2b9bfacac9 100644 (file)
--- a/tests/functional/all_daemons/ceph-override.json
+++ b/tests/functional/all_daemons/ceph-override.json
@@ -3,6 +3,7 @@
     "global": {
       "osd_pool_default_pg_num": 12,
       "osd_pool_default_size": 1,
+      "mon_warn_on_pool_no_redundancy": false
     }
   },
   "cephfs_pools": [

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 96da0ed86dd4fd2f918d60508104140b6441733c..82d16c488dea64bbc8ee84d395104ace53339bef 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -14,6 +14,7 @@ rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 openstack_config: True
 openstack_glance_pool:

diff --git a/tests/functional/all_daemons/container/group_vars/rgws b/tests/functional/all_daemons/container/group_vars/rgws
index 8f2a9a36826c94db739407d0324930035d152afe..18a2be67bca526c5c93f66399befef68b955938b 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/rgws
+++ b/tests/functional/all_daemons/container/group_vars/rgws
@@ -2,6 +2,6 @@
 copy_admin_key: True
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
+    pg_num: 16

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index f91c8b10fafd8138e9a3b1451a253fa84269140d..aa3d941ff6802f5f291296d37f20e0541a19051b 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -6,6 +6,7 @@ cluster_network: "192.168.2.0/24"
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 openstack_config: True
 openstack_glance_pool:

diff --git a/tests/functional/all_daemons/group_vars/rgws b/tests/functional/all_daemons/group_vars/rgws
index a882543144ab13e008ffb46a7cd2ea0061459711..29f5f8b2d29c519736bae8d47b0848b795603e2e 100644 (file)
--- a/tests/functional/all_daemons/group_vars/rgws
+++ b/tests/functional/all_daemons/group_vars/rgws
@@ -1,8 +1,8 @@
 copy_admin_key: true
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
+    pg_num: 16
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index b95e3e3980b77598b59c2ba53d4d2616925af705..dde8ae627e417383743935437a047be122caae25 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -16,6 +16,7 @@ rgw_bucket_default_quota_max_objects: 1638400
 ceph_conf_overrides:
   global:
     osd_pool_default_pg_num: 8
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10

diff --git a/tests/functional/collocation/container/group_vars/rgws b/tests/functional/collocation/container/group_vars/rgws
index 265d18208cb4839e8e3e9c5ae7fedb6e4165a44e..f1fc6a727e9566fe4ad8b815d048200f2f6d4f26 100644 (file)
--- a/tests/functional/collocation/container/group_vars/rgws
+++ b/tests/functional/collocation/container/group_vars/rgws
@@ -1,6 +1,6 @@
 ---
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
\ No newline at end of file
+    pg_num: 16
\ No newline at end of file

diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all
index 2fe10e7766d5640582be52015656da32d80b13f7..b22c8c90cb7410bc8566d0faf5e79ff981e1bbf2 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -13,6 +13,7 @@ rgw_bucket_default_quota_max_objects: 1638400
 ceph_conf_overrides:
   global:
     osd_pool_default_pg_num: 8
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
\ No newline at end of file

diff --git a/tests/functional/collocation/group_vars/rgws b/tests/functional/collocation/group_vars/rgws
index 265d18208cb4839e8e3e9c5ae7fedb6e4165a44e..f1fc6a727e9566fe4ad8b815d048200f2f6d4f26 100644 (file)
--- a/tests/functional/collocation/group_vars/rgws
+++ b/tests/functional/collocation/group_vars/rgws
@@ -1,6 +1,6 @@
 ---
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
\ No newline at end of file
+    pg_num: 16
\ No newline at end of file

diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all
index 4d70476dfa16dac642cc5e5a455e22ed42cd5eae..6537cd549d7736d1383273031dc95eecda6ff248 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/container/group_vars/all
@@ -21,6 +21,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False

diff --git a/tests/functional/lvm-auto-discovery/group_vars/all b/tests/functional/lvm-auto-discovery/group_vars/all
index aa15d6851f010e4a196961cc7bca6b04d3acaadb..6f3a064f26b81718747018b2b4c678907b021b67 100644 (file)
--- a/tests/functional/lvm-auto-discovery/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/group_vars/all
@@ -15,6 +15,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
 handler_health_mon_check_delay: 10

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index ebbfb503e5b885a66b27e3196137ecf0c53bbd58..4e465828e4c98fe79eee295b2a9ee39d841f4f3b 100644 (file)
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -23,6 +23,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False

diff --git a/tests/functional/lvm-batch/group_vars/all b/tests/functional/lvm-batch/group_vars/all
index ad72b72c5adc0a5b40571b460cba5d45adf97e1f..4e582ffadbeb4f588a285eb40f47eb9edd8a8453 100644 (file)
--- a/tests/functional/lvm-batch/group_vars/all
+++ b/tests/functional/lvm-batch/group_vars/all
@@ -17,6 +17,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
 handler_health_mon_check_delay: 10

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index 63e2676fdf797179ae2e7ee0cadb66178187f6a6..2be5afd8a923ff5591467184a1517972075d92b8 100644 (file)
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -17,6 +17,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False

diff --git a/tests/functional/lvm-osds/group_vars/all b/tests/functional/lvm-osds/group_vars/all
index c8b7d1895010b6e34495a583435c47bb23d14f93..e931f00c25d6f4ab02f43445c38260a1da1b66cb 100644 (file)
--- a/tests/functional/lvm-osds/group_vars/all
+++ b/tests/functional/lvm-osds/group_vars/all
@@ -12,6 +12,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
 handler_health_mon_check_delay: 10

diff --git a/tests/functional/migrate_ceph_disk_to_ceph_volume/group_vars/all b/tests/functional/migrate_ceph_disk_to_ceph_volume/group_vars/all
index e6e60a4bc0b7f197c4bc30a7da0a5fb41a835305..8f3b9604069d8a22fd5783e4e690dfd26ba8ba5c 100644 (file)
--- a/tests/functional/migrate_ceph_disk_to_ceph_volume/group_vars/all
+++ b/tests/functional/migrate_ceph_disk_to_ceph_volume/group_vars/all
@@ -19,4 +19,5 @@ os_tuning_params:
 ceph_conf_overrides:
   global:
     osd_pool_default_pg_num: 8
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1

diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts
index b8fd305f1e56693ff565116197644523ef50ef79..1da5280a8767108e9816bbaf7edc32363f960e34 100644 (file)
--- a/tests/functional/ooo-collocation/hosts
+++ b/tests/functional/ooo-collocation/hosts
@@ -3,6 +3,7 @@ all:
     admin_secret: AQBSV4xaAAAAABAA3VUTiOZTHecau2SnAEVPYQ==
     ceph_conf_overrides:
       global: {osd_pool_default_pg_num: 8, osd_pool_default_pgp_num: 8, osd_pool_default_size: 1,
+        mon_warn_on_pool_no_redundancy: false,
         rgw_keystone_accepted_roles: 'Member, admin', rgw_keystone_admin_domain: default,
         rgw_keystone_admin_password: RtYPg7AUdsZCGv4Z4rF8FvnaR, rgw_keystone_admin_project: service,
         rgw_keystone_admin_user: swift, rgw_keystone_api_version: 3, rgw_keystone_implicit_tenants: 'true',

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index fd5914ca6412373a49b0e682de1f405ce1e27077..4065ec7d35e888551e09393327cba27b38ad3cee 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -14,6 +14,7 @@ rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 openstack_config: True
 openstack_glance_pool:

diff --git a/tests/functional/podman/group_vars/rgws b/tests/functional/podman/group_vars/rgws
index 8f2a9a36826c94db739407d0324930035d152afe..18a2be67bca526c5c93f66399befef68b955938b 100644 (file)
--- a/tests/functional/podman/group_vars/rgws
+++ b/tests/functional/podman/group_vars/rgws
@@ -2,6 +2,6 @@
 copy_admin_key: True
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
+    pg_num: 16

diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all
index 7087c53a6482faca62c5de101f61c8c1a5a54724..5dffbdc76c45a409c3e77b345560a461ff7835f8 100644 (file)
--- a/tests/functional/rgw-multisite/container/group_vars/all
+++ b/tests/functional/rgw-multisite/container/group_vars/all
@@ -23,6 +23,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/rgw-multisite/container/group_vars/rgws b/tests/functional/rgw-multisite/container/group_vars/rgws
index 23b6f80d8e4c1a5a51c52acbf9e414ff27b793a2..ecf79a58240ce2cce560bbbe2f2f22085f10b893 100644 (file)
--- a/tests/functional/rgw-multisite/container/group_vars/rgws
+++ b/tests/functional/rgw-multisite/container/group_vars/rgws
@@ -13,8 +13,8 @@ system_access_key: 6kWkikvapSnHyE22P7nO
 system_secret_key: MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
+    pg_num: 16
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400

diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all
index 35a3ce6c76b6e5ea76e94b5060a41add8e91e624..2cf8cba8938cc2db62dbd86f6b52a6131ed6f058 100644 (file)
--- a/tests/functional/rgw-multisite/container/secondary/group_vars/all
+++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all
@@ -23,6 +23,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/rgws b/tests/functional/rgw-multisite/container/secondary/group_vars/rgws
index 60860e6a5bd48bd5fbbe1dcf92e0272bc689f046..d757776231d6d92f2e1ccf44a360f9b1520b16fd 100644 (file)
--- a/tests/functional/rgw-multisite/container/secondary/group_vars/rgws
+++ b/tests/functional/rgw-multisite/container/secondary/group_vars/rgws
@@ -1,8 +1,8 @@
 ---
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
+    pg_num: 16
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400
\ No newline at end of file

diff --git a/tests/functional/rgw-multisite/group_vars/all b/tests/functional/rgw-multisite/group_vars/all
index c3e831f5adc51786e053acbbf08abce03681ccbf..2b3afeccca0499e64ead93cc675080429d724454 100644 (file)
--- a/tests/functional/rgw-multisite/group_vars/all
+++ b/tests/functional/rgw-multisite/group_vars/all
@@ -21,5 +21,6 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/rgw-multisite/group_vars/rgws b/tests/functional/rgw-multisite/group_vars/rgws
index 23b6f80d8e4c1a5a51c52acbf9e414ff27b793a2..ecf79a58240ce2cce560bbbe2f2f22085f10b893 100644 (file)
--- a/tests/functional/rgw-multisite/group_vars/rgws
+++ b/tests/functional/rgw-multisite/group_vars/rgws
@@ -13,8 +13,8 @@ system_access_key: 6kWkikvapSnHyE22P7nO
 system_secret_key: MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
+    pg_num: 16
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400

diff --git a/tests/functional/rgw-multisite/secondary/group_vars/all b/tests/functional/rgw-multisite/secondary/group_vars/all
index ebb9e53d1c3f08347e9d945848549f972352bff7..b84b97cfa0265172a3446b1c14234cb726b888d8 100644 (file)
--- a/tests/functional/rgw-multisite/secondary/group_vars/all
+++ b/tests/functional/rgw-multisite/secondary/group_vars/all
@@ -21,6 +21,7 @@ os_tuning_params:
   - { name: fs.file-max, value: 26234859 }
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 ceph_osd_docker_run_script_path: /var/tmp
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/rgw-multisite/secondary/group_vars/rgws b/tests/functional/rgw-multisite/secondary/group_vars/rgws
index 60860e6a5bd48bd5fbbe1dcf92e0272bc689f046..d757776231d6d92f2e1ccf44a360f9b1520b16fd 100644 (file)
--- a/tests/functional/rgw-multisite/secondary/group_vars/rgws
+++ b/tests/functional/rgw-multisite/secondary/group_vars/rgws
@@ -1,8 +1,8 @@
 ---
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
+    pg_num: 16
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400
\ No newline at end of file

diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index 306cf41a036c0a3dc7711803a7487332dc1e7d7d..7d0c1ac95653b1c93bb8b64664ec0dd78a5c980f 100644 (file)
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -11,6 +11,7 @@ public_network: "192.168.79.0/24"
 cluster_network: "192.168.80.0/24"
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 openstack_config: False
 dashboard_enabled: False

diff --git a/tests/functional/shrink_mds/group_vars/all b/tests/functional/shrink_mds/group_vars/all
index 737913f244c70243ebb92c30534fa6840640100e..fe12c83d4d6c956826aa2374c07ce65e19ad9860 100644 (file)
--- a/tests/functional/shrink_mds/group_vars/all
+++ b/tests/functional/shrink_mds/group_vars/all
@@ -11,5 +11,6 @@ osd_scenario: lvm
 copy_admin_key: true
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
index bb6a1d4d6ba005feab45d1c67a09c1d7b305e10c..3ee1d3384798cbe46941e7c549fcea8153cc5cd8 100644 (file)
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -11,6 +11,7 @@ public_network: "192.168.83.0/24"
 cluster_network: "192.168.84.0/24"
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 openstack_config: False
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/group_vars/all b/tests/functional/shrink_mgr/group_vars/all
index 125a749eec0c014f3ba11d4eecc0966f9bb0e5be..68516c18e9af3368a96e89ed4d12d0122d20ba31 100644 (file)
--- a/tests/functional/shrink_mgr/group_vars/all
+++ b/tests/functional/shrink_mgr/group_vars/all
@@ -7,5 +7,6 @@ monitor_interface: eth1
 radosgw_interface: eth1
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index 78dc17390cf0bd008e40a1e44ee3dade6d748439..703be4ea38188f841e1e8b5336fa94e0cb193269 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -11,6 +11,7 @@ public_network: "192.168.17.0/24"
 cluster_network: "192.168.18.0/24"
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 openstack_config: False
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mon/group_vars/all b/tests/functional/shrink_mon/group_vars/all
index c16cacd74a8fb18a5acde1262d6e62f9eb3ed0d5..8beba506670dd2964e40d9e7d02243a97bdd9df5 100644 (file)
--- a/tests/functional/shrink_mon/group_vars/all
+++ b/tests/functional/shrink_mon/group_vars/all
@@ -5,5 +5,6 @@ public_network: "192.168.1.0/24"
 cluster_network: "192.168.2.0/24"
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index bc458f80ab20cad59e1d1214572c9e93925a877a..80dc11103390cca22b0010fd54f0e8b4de355c4d 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -11,6 +11,7 @@ public_network: "192.168.73.0/24"
 cluster_network: "192.168.74.0/24"
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 openstack_config: False
 dashboard_enabled: False

diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all
index 0594e228e44e7c80e594493aba9274c3a32aa714..7f7bb661ab88cb4ae012f3428de38498f89f6c70 100644 (file)
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -10,6 +10,7 @@ ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 openstack_config: False
 dashboard_enabled: False

diff --git a/tests/functional/shrink_rbdmirror/group_vars/all b/tests/functional/shrink_rbdmirror/group_vars/all
index 073a710ad659cc8fe9b801357d00baec85973ecc..45cccc7d3b24460d24c6e9cb5f27dbac93c9b670 100644 (file)
--- a/tests/functional/shrink_rbdmirror/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/group_vars/all
@@ -9,5 +9,6 @@ osd_scenario: lvm
 copy_admin_key: true
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False
\ No newline at end of file

diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all
index 1b376c9ca3985a77f2e01709445ae6939dd3ed94..213488e9dd7d88d16ddac50379ad59e25bbb4042 100644 (file)
--- a/tests/functional/shrink_rgw/container/group_vars/all
+++ b/tests/functional/shrink_rgw/container/group_vars/all
@@ -12,6 +12,7 @@ ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 openstack_config: False
 dashboard_enabled: False

diff --git a/tests/functional/shrink_rgw/container/group_vars/rgws b/tests/functional/shrink_rgw/container/group_vars/rgws
index 77466c8ae2419e0d0ae2db72837621079f8046bc..e4070c71663d5b9af2592bdd4957daad4b04ef4c 100644 (file)
--- a/tests/functional/shrink_rgw/container/group_vars/rgws
+++ b/tests/functional/shrink_rgw/container/group_vars/rgws
@@ -2,8 +2,8 @@
 copy_admin_key: true
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
+    pg_num: 16
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400

diff --git a/tests/functional/shrink_rgw/group_vars/all b/tests/functional/shrink_rgw/group_vars/all
index f4a27d45df2618fe4ab8d3972382525d5b19bc62..9833f6774cc6c446750cec94c510d088a64418c7 100644 (file)
--- a/tests/functional/shrink_rgw/group_vars/all
+++ b/tests/functional/shrink_rgw/group_vars/all
@@ -10,5 +10,6 @@ osd_scenario: lvm
 copy_admin_key: true
 ceph_conf_overrides:
   global:
+    mon_warn_on_pool_no_redundancy: false
     osd_pool_default_size: 1
 dashboard_enabled: False

diff --git a/tests/functional/shrink_rgw/group_vars/rgws b/tests/functional/shrink_rgw/group_vars/rgws
index 77466c8ae2419e0d0ae2db72837621079f8046bc..e4070c71663d5b9af2592bdd4957daad4b04ef4c 100644 (file)
--- a/tests/functional/shrink_rgw/group_vars/rgws
+++ b/tests/functional/shrink_rgw/group_vars/rgws
@@ -2,8 +2,8 @@
 copy_admin_key: true
 rgw_create_pools:
   foo:
-    pg_num: 17
+    pg_num: 16
   bar:
-    pg_num: 19
+    pg_num: 16
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400