From b653bc306a11aad6e7dff1509a01baee76414c8d Mon Sep 17 00:00:00 2001 From: parth-gr Date: Wed, 25 Oct 2023 18:55:20 +0530 Subject: [PATCH] ci: fix mgr pdb resource count from recent ocs operator changes we are trying to have more than 1 mgr by deafult, So to imply it we need to check for the mgr pdb which would get created if mgr count >1 Signed-off-by: parth-gr --- ocs_ci/ocs/cluster.py | 3 ++- ocs_ci/ocs/constants.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ocs_ci/ocs/cluster.py b/ocs_ci/ocs/cluster.py index dfd5ed8b50d5..9efb8cec7c0e 100644 --- a/ocs_ci/ocs/cluster.py +++ b/ocs_ci/ocs/cluster.py @@ -1240,9 +1240,10 @@ def validate_pdb_creation(): item_list = pdb_obj.get().get("items") pdb_count = constants.PDB_COUNT pdb_required = [constants.MDS_PDB, constants.MON_PDB, constants.OSD_PDB] + pdb_required.extend(constants.MGR_PDB) if config.DEPLOYMENT.get("arbiter_deployment"): pdb_count = constants.PDB_COUNT_ARBITER - pdb_required.extend((constants.MGR_PDB, constants.RGW_PDB)) + pdb_required.extend(constants.RGW_PDB) if len(item_list) != pdb_count: raise PDBNotCreatedException( f"Not All PDB's created. Expected {pdb_count} PDB's but found {len(item_list)}" diff --git a/ocs_ci/ocs/constants.py b/ocs_ci/ocs/constants.py index fb0e87df186e..570f41e11713 100644 --- a/ocs_ci/ocs/constants.py +++ b/ocs_ci/ocs/constants.py @@ -1215,7 +1215,7 @@ MON_PDB = "rook-ceph-mon-pdb" MGR_PDB = "rook-ceph-mgr-pdb" RGW_PDB = "rook-ceph-rgw-ocs-storagecluster-cephobjectstore" -PDB_COUNT = 3 +PDB_COUNT = 4 PDB_COUNT_ARBITER = 5 # Root Disk size