Merge "Introduce CephHciOsdCount and CephHciOsdType"

deployment/cephadm/ceph-osd.yaml

@@ -41,6 +41,38 @@ parameters:
     type: boolean
     default: false
     description: Parameter used to trigger the dashboard deployment.
+  CephHciOsdCount:
+    type: number
+    default: 0
+    tags:
+      - role_specific
+    description: |
+      The number of expected Ceph OSDs per HCI node. Used by Ansible
+      module tripleo_derive_hci_parameters when cephadm/HCI is used. Since
+      CephOsdSpec might only specify a description of devices to be used
+      as OSDs (e.g. all devices), and not a list of devices as found in
+      CephAnsibleDisksConfig, this number is necessary in order to know
+      how much CPU/RAM to reserve.
+  CephHciOsdType:
+    type: string
+    default: 'hdd'
+    tags:
+      - role_specific
+    constraints:
+      - allowed_values: ['hdd', 'ssd', 'nvme']
+    description: |
+      CephHciOsdType is the type of data_device (not db_device) used for each
+      HCI node's OSD and must be one of hdd, ssd, or nvme. Used by Ansible
+      module tripleo_derive_hci_parameters when cephadm/HCI is used. Since
+      CephOsdSpec might only specify a description of devices to be used
+      as OSDs (e.g. all devices), and not a list of devices as found in
+      CephAnsibleDisksConfig, the device path is not hard coded so we cannot
+      look up that device in Ironic to determine its type. If CephOsdSpec
+      has data_devices/rotational=1 and db_devices/rotational=0, then set
+      CephHciOsdType to 'hdd', since only the DB/WAL are on SSD. If an OSD
+      data device is an SSD or NVMe SSD, then set the type accordingly so
+      that the derive paramters module can allocate the optimal number of
+      CPUs per device.
 
 resources:
   CephBase:

releasenotes/notes/ceph-hci-osd-count-type-241614543ef7cc58.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    The parameters CephHciOsdCount and CephHciOsdType were added in order to
+    support the derive parameters feature for hyperconverged deployments when
+    using cephadm.