Skip to content

Commit

Permalink
Merge pull request #4390 from pdhiran/3az-update
Browse files Browse the repository at this point in the history 
Fixing Rados CIDR blocklisting test suite post Cluster config consolidation
  • Loading branch information
@mergify
mergify[bot] authored Jan 20, 2025
2 parents 649d88e + b987423 commit fb51538
Show file tree
Hide file tree
Showing 11 changed files with 354 additions and 19 deletions.
151 changes: 151 additions & 0 deletions conf/reef/rados/13-node-cluster-4-clients-rhos-d.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
# Test Suite to test CIDR blocklisting of clients + every other generic rados test suite
# Deployment for all the ceph daemons , with 5 mon's, 5 mgr's, 36 OSD daemons & 4 Client nodes
# 12 x OSD hosts: 10 standard, 2 backup
globals:
- ceph-cluster:
name: ceph
node1:
networks:
- provider_net_cci_15
role:
- _admin
- mon
- mgr
- installer
- alertmanager
- grafana
- prometheus
node2:
networks:
- provider_net_cci_15
role:
- osd
- rgw
- mds
no-of-volumes: 4
disk-size: 15
node3:
networks:
- provider_net_cci_15
role:
- mon
- mgr
- osd
no-of-volumes: 4
disk-size: 15
node4:
networks:
- provider_net_cci_15
role:
- osd
- rgw
- mds
no-of-volumes: 4
disk-size: 15
node5:
networks:
- provider_net_cci_15
role:
- osd
- nfs
no-of-volumes: 4
disk-size: 15
node6:
networks:
- provider_net_cci_15
role:
- osd
- rgw
- mds
no-of-volumes: 4
disk-size: 15
node7:
image-name:
openstack: RHEL-9.4.0-x86_64-ga-latest
ibmc: rhel-91-server-released
networks:
- provider_net_cci_16
role:
- client
node8:
networks:
- provider_net_cci_15
role:
- mon
- mgr
- osd
no-of-volumes: 4
disk-size: 15
node9:
networks:
- provider_net_cci_15
role:
- osd
- mon
- mgr
no-of-volumes: 4
disk-size: 15
node10:
networks:
- provider_net_cci_15
role:
- osd
- nfs
no-of-volumes: 4
disk-size: 15
node11:
networks:
- provider_net_cci_15
role:
- mon
- mgr
- osd
no-of-volumes: 4
disk-size: 15
node12:
networks:
- provider_net_cci_15
role:
- osd-bak
no-of-volumes: 4
disk-size: 15
node13:
networks:
- provider_net_cci_15
role:
- osd-bak
no-of-volumes: 4
disk-size: 15
node14:
networks:
- provider_net_cci_15
role:
- rgw
- mds
- osd
no-of-volumes: 4
disk-size: 15
node15:
image-name:
openstack: RHEL-9.4.0-x86_64-ga-latest
ibmc: rhel-91-server-released
networks:
- provider_net_cci_16
role:
- client
node16:
image-name:
openstack: RHEL-9.4.0-x86_64-ga-latest
ibmc: rhel-91-server-released
networks:
- provider_net_cci_13
role:
- client
node17:
image-name:
openstack: RHEL-9.4.0-x86_64-ga-latest
ibmc: rhel-91-server-released
networks:
- provider_net_cci_13
role:
- client
16 changes: 16 additions & 0 deletions conf/reef/rados/13-node-cluster-4-clients.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ globals:
no-of-volumes: 4
disk-size: 15
node5:
networks:
- shared_net_15
role:
- osd
- nfs
Expand All @@ -66,43 +68,57 @@ globals:
role:
- client
node8:
networks:
- shared_net_15
role:
- mon
- mgr
- osd
no-of-volumes: 4
disk-size: 15
node9:
networks:
- shared_net_15
role:
- osd
- mon
- mgr
no-of-volumes: 4
disk-size: 15
node10:
networks:
- shared_net_15
role:
- osd
- nfs
no-of-volumes: 4
disk-size: 15
node11:
networks:
- shared_net_15
role:
- mon
- mgr
- osd
no-of-volumes: 4
disk-size: 15
node12:
networks:
- shared_net_15
role:
- osd-bak
no-of-volumes: 4
disk-size: 15
node13:
networks:
- shared_net_15
role:
- osd-bak
no-of-volumes: 4
disk-size: 15
node14:
networks:
- shared_net_15
role:
- rgw
- mds
Expand Down
151 changes: 151 additions & 0 deletions conf/squid/rados/13-node-cluster-4-clients-rhos-d.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
# Test Suite to test CIDR blocklisting of clients + every other generic rados test suite
# Deployment for all the ceph daemons , with 5 mon's, 5 mgr's, 36 OSD daemons & 4 Client nodes
# 12 x OSD hosts: 10 standard, 2 backup
globals:
- ceph-cluster:
name: ceph
node1:
networks:
- provider_net_cci_15
role:
- _admin
- mon
- mgr
- installer
- alertmanager
- grafana
- prometheus
node2:
networks:
- provider_net_cci_15
role:
- osd
- rgw
- mds
no-of-volumes: 4
disk-size: 15
node3:
networks:
- provider_net_cci_15
role:
- mon
- mgr
- osd
no-of-volumes: 4
disk-size: 15
node4:
networks:
- provider_net_cci_15
role:
- osd
- rgw
- mds
no-of-volumes: 4
disk-size: 15
node5:
networks:
- provider_net_cci_15
role:
- osd
- nfs
no-of-volumes: 4
disk-size: 15
node6:
networks:
- provider_net_cci_15
role:
- osd
- rgw
- mds
no-of-volumes: 4
disk-size: 15
node7:
image-name:
openstack: RHEL-9.4.0-x86_64-ga-latest
ibmc: rhel-91-server-released
networks:
- provider_net_cci_16
role:
- client
node8:
networks:
- provider_net_cci_15
role:
- mon
- mgr
- osd
no-of-volumes: 4
disk-size: 15
node9:
networks:
- provider_net_cci_15
role:
- osd
- mon
- mgr
no-of-volumes: 4
disk-size: 15
node10:
networks:
- provider_net_cci_15
role:
- osd
- nfs
no-of-volumes: 4
disk-size: 15
node11:
networks:
- provider_net_cci_15
role:
- mon
- mgr
- osd
no-of-volumes: 4
disk-size: 15
node12:
networks:
- provider_net_cci_15
role:
- osd-bak
no-of-volumes: 4
disk-size: 15
node13:
networks:
- provider_net_cci_15
role:
- osd-bak
no-of-volumes: 4
disk-size: 15
node14:
networks:
- provider_net_cci_15
role:
- rgw
- mds
- osd
no-of-volumes: 4
disk-size: 15
node15:
image-name:
openstack: RHEL-9.4.0-x86_64-ga-latest
ibmc: rhel-91-server-released
networks:
- provider_net_cci_16
role:
- client
node16:
image-name:
openstack: RHEL-9.4.0-x86_64-ga-latest
ibmc: rhel-91-server-released
networks:
- provider_net_cci_13
role:
- client
node17:
image-name:
openstack: RHEL-9.4.0-x86_64-ga-latest
ibmc: rhel-91-server-released
networks:
- provider_net_cci_13
role:
- client
Loading

0 comments on commit fb51538

Please sign in to comment.