From 10d4e7b3e1b7d23b2ae936ffb953caa118698201 Mon Sep 17 00:00:00 2001
From: John Fulton <fulton@redhat.com>
Date: Wed, 30 Nov 2022 08:42:53 -0500
Subject: [PATCH] Remove CephHciOsdType and CephHciOsdCount parameters

CephHciOsdType and CephHciOsdCount parameters, used only
by the deprecated derive parameters feature, should be
removed. They were missed during initial clean up.

Change-Id: Iaefc0347ac18764a683fde82075adb3067861ebf
(cherry picked from commit 4e62ae536324df783d228039908d68f34aa11703)
---
 deployment/cephadm/ceph-osd.yaml              | 32 -------------------
 ...s_osd_type_osd_count-6fe114130d1e4b2e.yaml |  5 +++
 2 files changed, 5 insertions(+), 32 deletions(-)
 create mode 100644 releasenotes/notes/remove_derived_params_osd_type_osd_count-6fe114130d1e4b2e.yaml

diff --git a/deployment/cephadm/ceph-osd.yaml b/deployment/cephadm/ceph-osd.yaml
index 81ef520158..dab05100f6 100644
--- a/deployment/cephadm/ceph-osd.yaml
+++ b/deployment/cephadm/ceph-osd.yaml
@@ -38,38 +38,6 @@ 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 parameters module can allocate the optimal number of
-      CPUs per device.
 
 resources:
   CephBase:
diff --git a/releasenotes/notes/remove_derived_params_osd_type_osd_count-6fe114130d1e4b2e.yaml b/releasenotes/notes/remove_derived_params_osd_type_osd_count-6fe114130d1e4b2e.yaml
new file mode 100644
index 0000000000..a9e4e20f8c
--- /dev/null
+++ b/releasenotes/notes/remove_derived_params_osd_type_osd_count-6fe114130d1e4b2e.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    CephHciOsdType and CephHciOsdCount parameters, used by the deprecated
+    derive parameters feature, have been removed.