Merge "Deprecate CephPoolDefaultPgNum and CephPoolDefaultSize"

ci/environments/scenario001-multinode-containers.yaml

@@ -113,14 +113,10 @@ parameter_defaults:
     - gnocchi://?archive_policy=ceilometer-high-rate
   CeilometerQdrPublishEvents: true
   ManageEventPipeline: true
-
   Debug: true
   DockerPuppetDebug: True
-  CephPoolDefaultPgNum: 8
-  CephPoolDefaultSize: 1
   CephPools:
     - name: altrbd
-      pg_num: 8
       rule_name: replicated_rule
   #NOTE: These ID's and keys should be regenerated for
   # a production deployment. What is here is suitable for

ci/environments/scenario001-standalone.yaml

@@ -59,15 +59,12 @@ parameter_defaults:
   ManagePipeline: true
   Debug: true
   DeployedCeph: true
-  CephPoolDefaultPgNum: 8
-  CephPoolDefaultSize: 1
   CephEnableDashboard: true
   CephDashboardPort: 8445
   GrafanaDashboardPort: 3200
   CinderRbdExtraPools: altrbd,pool2,pool3
   CephPools:
     - name: altrbd
-      pg_num: 8
       rule_name: replicated_rule
       application: rbd
   #NOTE: These ID's and keys should be regenerated for

ci/environments/scenario004-standalone.yaml

@@ -33,8 +33,6 @@ parameter_defaults:
   GlanceSparseUploadEnabled: true
   ManagePolling: true
   Debug: true
-  CephPoolDefaultPgNum: 8
-  CephPoolDefaultSize: 1
   CephEnableDashboard: false
   CephDashboardPort: 8445
   CephAdmVerbose: true

ci/environments/scenario010-multinode-containers.yaml

@@ -75,11 +75,8 @@ parameter_defaults:
     nova::compute::libvirt::virt_type: qemu
     octavia::controller::connection_retry_interval: 10
   Debug: true
-  CephPoolDefaultPgNum: 8
-  CephPoolDefaultSize: 1
   CephPools:
     - name: altrbd
-      pg_num: 8
       rule_name: replicated_rule
   CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
   CephClusterName: mycephcluster

ci/environments/scenario010-standalone.yaml

@@ -33,8 +33,6 @@ parameter_defaults:
     8CF1A7EA-7B4B-4433-AC83-17675514B1B8: {"foo2": "bar2"}
   Debug: true
   HideSensitiveLogs: false
-  CephPoolDefaultPgNum: 8
-  CephPoolDefaultSize: 1
   #NOTE: These ID's and keys should be regenerated for
   # a production deployment. What is here is suitable for
   # developer and CI testing only.

deployment/cephadm/ceph-base.yaml

@@ -74,16 +74,24 @@ parameters:
     description: >
       Enable Ceph msgr2 secure mode to enable on-wire encryption between Ceph
       daemons and also between Ceph clients and daemons.
-  CephPoolDefaultPgNum:
-    description: default pg_num to use for the RBD pools
-    type: number
-    default: 16
   CephPools:
     description: >
-      It can be used to override settings for one of the predefined pools, or to create
-      additional ones. Example:
-      [{"name": "volumes", "pg_num": 64, "rule_name": "replicated_rule"},
-       {"name": "vms", "target_size_ratio": "0.4", "rule_name": "replicated_rule"}]
+      Used to override settings (mainly target_size_ratio or pg_num) in pools.
+      Pacific has pg_autoscale_mode enabled by default so set target_size_ratio
+      as a percentage of the expected data consumption. The example below sets
+      cinder volumes 40%, glance images 10%, nova vms 30% (20% of space free).
+      Not set by default but overrides are encouraged to avoid data rebalancing.
+      For example,
+      CephPools:
+        - name: volumes
+          target_size_ratio: 0.4
+          application: rbd
+        - name: images
+          target_size_ratio: 0.1
+          application: rbd
+        - name: vms
+          target_size_ratio: 0.3
+          application: rbd
     default: []
     type: json
   CinderRbdPoolName:
@@ -167,10 +175,6 @@ parameters:
     hidden: true
     constraints:
     - allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
-  CephPoolDefaultSize:
-    description: default minimum replication for RBD copies
-    type: number
-    default: 3
   ManilaCephFSDataPoolName:
     default: manila_data
     type: string
@@ -197,6 +201,16 @@ parameters:
   ContainerCephDaemonImage:
     description: image
     type: string
+  # start DEPRECATED options for compatibility with older versions
+  CephPoolDefaultPgNum:
+    description: default pg_num to use for the RBD pools
+    type: number
+    default: 16
+  CephPoolDefaultSize:
+    description: default minimum replication for RBD copies
+    type: number
+    default: 3
+  # end DEPRECATED options for compatibility with older versions
   ContainerImageRegistryCredentials:
     type: json
     hidden: true
@@ -354,7 +368,9 @@ parameters:
 parameter_groups:
 - label: deprecated
   description: Do not use deprecated params, they will be removed.
-  parameters: []
+  parameters:
+    - CephPoolDefaultPgNum
+    - CephPoolDefaultSize
 
 conditions:
   custom_registry_host:
@@ -414,10 +430,7 @@ resources:
     properties:
       type: json
       value:
-        vars:
-          osd_pool_default_size: {get_param: CephPoolDefaultSize}
-          osd_pool_default_pg_num: {get_param: CephPoolDefaultPgNum}
-          osd_pool_default_pgp_num: {get_param: CephPoolDefaultPgNum}
+        vars: {}
 
   CephAdmVars:
     type: OS::Heat::Value
@@ -522,12 +535,9 @@ outputs:
                         - true
                         - false
                   extra_pools: {get_param: CephPools}
-                  pg_num: {get_param: CephPoolDefaultPgNum}
                 manila_pools:
                   data: {get_param: ManilaCephFSDataPoolName}
                   metadata: {get_param: ManilaCephFSMetadataPoolName}
-                  data_pg_num: {get_param: CephPoolDefaultPgNum}
-                  metadata_pg_num: {get_param: CephPoolDefaultPgNum}
                 ceph_keys:
                   openstack_client:
                     name: {get_param: CephClientUserName}

releasenotes/notes/deprecate_ceph_pg_num_in_tht-91fe6303cc5ba07e.yaml

@@ -0,0 +1,13 @@
+---
+deprecations:
+  - |
+    CephPoolDefaultPgNum and CephPoolDefaultSize have been deprecated and no
+    longer affect the Ceph deployment because the Ceph deployment is run before
+    these parameters are used. I.e. Ceph is deployed by TripleO via 'openstack
+    overcloud ceph deploy' which does not use these parameters. It is no longer
+    required to pass a PG number when creating Ceph pools but it is recommended
+    to use CephPools to override target_size_ratio (or PG number) so pools do
+    not inherit the default PG replica values depending on the Ceph release.
+    Since Ceph pg_autoscale_mode is enabled by default in Pacific, PG numbers
+    will adjust themselves correctly. However, data migration can be reduced by
+    setting target_size_ratio (or PG number) in advance.