diff --git a/conf/squid/rgw/3-way-ms-ec-profile-2+2@4nodes.yaml b/conf/squid/rgw/3-way-ms-ec-profile-2+2@4nodes.yaml index 3f299ae34..b2397f769 100644 --- a/conf/squid/rgw/3-way-ms-ec-profile-2+2@4nodes.yaml +++ b/conf/squid/rgw/3-way-ms-ec-profile-2+2@4nodes.yaml @@ -5,8 +5,8 @@ globals: name: ceph-pri node1: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - _admin - installer @@ -15,8 +15,8 @@ globals: - osd node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - mon @@ -24,16 +24,16 @@ globals: node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd - rgw node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw @@ -42,8 +42,8 @@ globals: name: ceph-sec node1: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - _admin - installer @@ -52,24 +52,24 @@ globals: - osd node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - mon - osd node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd - rgw node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw @@ -80,8 +80,8 @@ globals: name: ceph-ter node1: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - _admin - installer @@ -90,24 +90,24 @@ globals: - osd node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - mon - osd node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd - rgw node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw diff --git a/conf/squid/rgw/cloud_transition.yaml b/conf/squid/rgw/cloud_transition.yaml index 81175b397..e0cefff1e 100644 --- a/conf/squid/rgw/cloud_transition.yaml +++ b/conf/squid/rgw/cloud_transition.yaml @@ -11,29 +11,29 @@ globals: - mon node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - osd node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd node5: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw @@ -53,29 +53,29 @@ globals: - mon node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - osd node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd node5: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw diff --git a/conf/squid/rgw/ec-profile-4+2-cluster.yaml b/conf/squid/rgw/ec-profile-4+2-cluster.yaml index 20b2219f9..c744cc4d7 100644 --- a/conf/squid/rgw/ec-profile-4+2-cluster.yaml +++ b/conf/squid/rgw/ec-profile-4+2-cluster.yaml @@ -12,41 +12,41 @@ globals: - mon node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - mon - osd node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd node5: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd node6: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd node7: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw diff --git a/conf/squid/rgw/migrate_default_single_to_multisite.yaml b/conf/squid/rgw/migrate_default_single_to_multisite.yaml index 164c1463a..69af6190e 100644 --- a/conf/squid/rgw/migrate_default_single_to_multisite.yaml +++ b/conf/squid/rgw/migrate_default_single_to_multisite.yaml @@ -10,31 +10,31 @@ globals: - mon node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - osd node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd - rgw node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd - rgw node5: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw @@ -54,31 +54,31 @@ globals: - mon node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - osd node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd - rgw node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd - rgw node5: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw diff --git a/conf/squid/rgw/rgw_multisite_spec.yaml b/conf/squid/rgw/rgw_multisite_spec.yaml index e0bce0d4c..8c43c1955 100644 --- a/conf/squid/rgw/rgw_multisite_spec.yaml +++ b/conf/squid/rgw/rgw_multisite_spec.yaml @@ -11,31 +11,31 @@ globals: - mon node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - osd - mon node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd - rgw node5: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw @@ -55,30 +55,30 @@ globals: - mon node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - osd - mon node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw node5: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw diff --git a/conf/squid/rgw/tier-3_archive_zone_colocate_data_zone_conf.yaml b/conf/squid/rgw/tier-3_archive_zone_colocate_data_zone_conf.yaml index 9c4edb283..4a1f1a7b9 100644 --- a/conf/squid/rgw/tier-3_archive_zone_colocate_data_zone_conf.yaml +++ b/conf/squid/rgw/tier-3_archive_zone_colocate_data_zone_conf.yaml @@ -24,23 +24,23 @@ globals: - rgw - client node5: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd node6: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd node7: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd node8: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - ceph-cluster: @@ -54,23 +54,23 @@ globals: - mon node2: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mgr - mon - osd node3: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - mon - osd node4: - disk-size: 20 - no-of-volumes: 4 + disk-size: 15 + no-of-volumes: 3 role: - osd - rgw