diff options
| -rw-r--r-- | ci/environments/multinode-containers.yaml | 3 | ||||
| -rw-r--r-- | ci/environments/multinode.yaml | 3 | ||||
| -rw-r--r-- | ci/environments/scenario001-multinode.yaml | 3 | ||||
| -rw-r--r-- | ci/environments/scenario004-multinode-containers.yaml | 3 | ||||
| -rw-r--r-- | ci/environments/scenario004-multinode.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/ceph-mon.yaml | 4 |
6 files changed, 17 insertions, 2 deletions
diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index 781527f4..7f0d6221 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -65,6 +65,9 @@ parameter_defaults: #http://docs.ceph.com/docs/jewel/rados/configuration/filesystem-recommendations/ ceph::profile::params::osd_max_object_name_len: 256 ceph::profile::params::osd_max_object_namespace_len: 64 + #NOTE(gfidente): necessary when deploying a single OSD + ceph::profile::params::osd_pool_default_pg_num: 32 + ceph::profile::params::osd_pool_default_pgp_num: 32 SwiftCeilometerPipelineEnabled: False Debug: True NotificationDriver: 'noop' diff --git a/ci/environments/multinode.yaml b/ci/environments/multinode.yaml index eeeefc07..b939e377 100644 --- a/ci/environments/multinode.yaml +++ b/ci/environments/multinode.yaml @@ -67,6 +67,9 @@ parameter_defaults: #http://docs.ceph.com/docs/jewel/rados/configuration/filesystem-recommendations/ ceph::profile::params::osd_max_object_name_len: 256 ceph::profile::params::osd_max_object_namespace_len: 64 + #NOTE(gfidente): necessary when deploying a single OSD + ceph::profile::params::osd_pool_default_pg_num: 32 + ceph::profile::params::osd_pool_default_pgp_num: 32 SwiftCeilometerPipelineEnabled: False Debug: True NotificationDriver: 'noop' diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml index a9fbdfb7..177b73c0 100644 --- a/ci/environments/scenario001-multinode.yaml +++ b/ci/environments/scenario001-multinode.yaml @@ -103,6 +103,9 @@ parameter_defaults: ExtraConfig: ceph::profile::params::osd_max_object_name_len: 256 ceph::profile::params::osd_max_object_namespace_len: 64 + #NOTE(gfidente): necessary when deploying a single OSD + ceph::profile::params::osd_pool_default_pg_num: 32 + ceph::profile::params::osd_pool_default_pgp_num: 32 #NOTE: These ID's and keys should be regenerated for # a production deployment. What is here is suitable for # developer and CI testing only. diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index 4b647925..7eb9813e 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/ci/environments/scenario004-multinode-containers.yaml @@ -98,6 +98,9 @@ parameter_defaults: ExtraConfig: ceph::profile::params::osd_max_object_name_len: 256 ceph::profile::params::osd_max_object_namespace_len: 64 + #NOTE(gfidente): necessary when deploying a single OSD + ceph::profile::params::osd_pool_default_pg_num: 32 + ceph::profile::params::osd_pool_default_pgp_num: 32 #NOTE: These ID's and keys should be regenerated for # a production deployment. What is here is suitable for # developer and CI testing only. diff --git a/ci/environments/scenario004-multinode.yaml b/ci/environments/scenario004-multinode.yaml index a81f05e1..0dfeb63a 100644 --- a/ci/environments/scenario004-multinode.yaml +++ b/ci/environments/scenario004-multinode.yaml @@ -89,6 +89,9 @@ parameter_defaults: ExtraConfig: ceph::profile::params::osd_max_object_name_len: 256 ceph::profile::params::osd_max_object_namespace_len: 64 + #NOTE(gfidente): necessary when deploying a single OSD + ceph::profile::params::osd_pool_default_pg_num: 32 + ceph::profile::params::osd_pool_default_pgp_num: 32 #NOTE: These ID's and keys should be regenerated for # a production deployment. What is here is suitable for # developer and CI testing only. diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml index 4fe6e908..5783d18c 100644 --- a/puppet/services/ceph-mon.yaml +++ b/puppet/services/ceph-mon.yaml @@ -109,8 +109,8 @@ outputs: - get_attr: [CephBase, role_data, config_settings] - ceph::profile::params::ms_bind_ipv6: {get_param: CephIPv6} ceph::profile::params::mon_key: {get_param: CephMonKey} - ceph::profile::params::osd_pool_default_pg_num: 32 - ceph::profile::params::osd_pool_default_pgp_num: 32 + ceph::profile::params::osd_pool_default_pg_num: 128 + ceph::profile::params::osd_pool_default_pgp_num: 128 ceph::profile::params::osd_pool_default_size: {get_param: CephPoolDefaultSize} # repeat returns items in a list, so we need to map_merge twice tripleo::profile::base::ceph::mon::ceph_pools: |