Set Ceph pgp_num after pg_num

We missed to set the pgp_num default in ceph.conf, causing WARNING
messages like:

  pool default.rgw.buckets.data pg_num 32 > pgp_num 8

Also increases the default pg_num to 128 which is the recommended
value for less than 5 OSDs [1].

1. http://docs.ceph.com/docs/master/rados/operations/placement-groups/

Change-Id: Ibd9fb23e04576e95e24af58f856663397886a947
Closes-Bug: #1718173
(cherry picked from commit 58e6f6533a04eddd2dc897d890737bbccde4ea7b)

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index 9941234..d333a03 100644 (file)
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -68,7 +68,7 @@ parameters:
   CephPoolDefaultPgNum:
     description: default pg_num to use for the RBD pools
     type: number
-    default: 32
+    default: 128
   CephPools:
     description: >
       It can be used to override settings for one of the predefined pools, or to create
@@ -276,6 +276,7 @@ outputs:
               - global:
                   osd_pool_default_size: {get_param: CephPoolDefaultSize}
                   osd_pool_default_pg_num: {get_param: CephPoolDefaultPgNum}
+                  osd_pool_default_pgp_num: {get_param: CephPoolDefaultPgNum}
                   rgw_keystone_api_version: 3
                   rgw_keystone_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
                   rgw_keystone_accepted_roles: 'Member, _member_, admin'