Skip to content

Commit

Permalink
ci: fix mgr pdb resource count
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
parth-gr committed Oct 25, 2023
1 parent 2c075af commit b653bc3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ocs_ci/ocs/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)}"
Expand Down
2 changes: 1 addition & 1 deletion ocs_ci/ocs/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b653bc3

Please sign in to comment.