add logic for custom classes

Signed-off-by: David-M-IBM <David.massey@ibm.com>

Author: David-M-IBM

cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run-ocpv.yaml

@@ -12,22 +12,24 @@ spec:
       value: "cloud-pak-deployer"
     - name: storage-class
       value: "ocs-external-storagecluster-cephfs"
-    - name: block-storage-class
+    - name: custom-file-storage-class
+      value: "ocs-external-storagecluster-cephfs"
+    - name: custom-block-storage-class
       value: "ocs-external-storagecluster-ceph-rbd"
     - name: cloud-pak-deployer-storage-type
       value: "custom"
+    - name: ibm-entitlement-key
+      value: "false"
     - name: ocp-client-version
-      value: "4.15"
+      value: "4.16"
     - name: cp4d-version
-      value: "5.0.1"
+      value: "5.0.3"
     - name: cpd-use-fs-iam
       value: "False"
     - name: cpd-sequential-install
       value: "True"
     - name: db2-state
       value: "installed"
-    - name: cloud-pak-deployer-version
-      value: "v2.9.4"
     - name: wml-state
       value: "installed"
     - name: ws-state

cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline-run.yaml

@@ -15,19 +15,19 @@ spec:
     - name: ocp-client-version
       value: "4.14"
     - name: cp4d-version
-      value: "5.0.0"
+      value: "5.0.2"
     - name: ibm-entitlement-key
       value: "false"
     - name: cpd-use-fs-iam
       value: "False"
     - name: cpd-sequential-install
       value: "True"
-    - name: cloud-pak-deployer-version
-      value: "v2.9.4"
     # - name: analyticsengine-state
     #   value: "installed"
     # - name: spss-state
     #   value: "installed"
+    # - name: ca-state
+    #   value: "installed"
     # - name: dashboard-state
     #   value: "installed"
     # - name: dataproduct-state

cp4d/5.0.x-tse-l4-base/cp4d-cloud-pak-deployer-pipeline.yaml

@@ -12,12 +12,16 @@ spec:
       default: "cloud-pak-deployer"
     - name: storage-class
       type: string
-      description: RWX file storage class needed for cp4d
+      description: storage class for the cloud pak deployer PVC
       default: "ocs-storagecluster-cephfs"
-    - name: block-storage-class
+    - name: custom-file-storage-class
       type: string
-      description: Block storage class needed for cp4d
-      default: "ocs-storagecluster-ceph-rbd"
+      description: Custom RWX file storage class needed for cp4d
+      default: ""
+    - name: custom-block-storage-class
+      type: string
+      description: Custom block storage class needed for cp4d
+      default: ""
     - name: cloud-pak-deployer-storage-class
       type: string
       description: |
@@ -1495,6 +1499,15 @@ spec:
       params:
         - name: SCRIPT
           value: |
+
+            if [[ "$(params.cloud-pak-deployer-storage-type)" == "custom" ]]; then
+              custom_file_class_yml="ocp_storage_class_file: $(params.custom-file-storage-class)"
+              custom_block_class_yml="ocp_storage_class_block: $(params.custom-block-storage-class)"
+            else
+              custom_file_class_yml=""
+              custom_block_class_yml=""
+            fi
+
             oc apply -f - <<EOF
             apiVersion: v1
             kind: ConfigMap
@@ -1521,8 +1534,8 @@ spec:
                   openshift_storage:
                   - storage_name: $(params.cloud-pak-deployer-storage-class)
                     storage_type: $(params.cloud-pak-deployer-storage-type)
-                    ocp_storage_class_file: $(params.storage-class)
-                    ocp_storage_class_block: $(params.block-storage-class)
+                    $custom_file_class_yml
+                    $custom_block_class_yml
 
                 #
                 # All tested cartridges. To install, change the "state" property to "installed". To uninstall, change the state

cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline-run-ocpv.yaml

@@ -12,22 +12,22 @@ spec:
       value: "cloud-pak-deployer"
     - name: storage-class
       value: "ocs-external-storagecluster-cephfs"
-    - name: block-storage-class
+    - name: custom-file-storage-class
+      value: "ocs-external-storagecluster-cephfs"
+    - name: custom-block-storage-class
       value: "ocs-external-storagecluster-ceph-rbd"
     - name: cloud-pak-deployer-storage-type
       value: "custom"
     - name: ocp-client-version
-      value: "4.15"
+      value: "4.16"
     - name: cp4d-version
-      value: "5.0.1"
+      value: "5.0.3"
     - name: cpd-use-fs-iam
       value: "False"
     - name: cpd-sequential-install
       value: "True"
     - name: db2-state
       value: "installed"
-    - name: cloud-pak-deployer-version
-      value: "v2.9.4"
     - name: wml-state
       value: "installed"
     - name: ws-state

cp4d/5.0.x/cp4d-cloud-pak-deployer-pipeline.yaml

@@ -12,11 +12,15 @@ spec:
       default: "cloud-pak-deployer"
     - name: storage-class
       type: string
-      description: RWX storage class needed for cp4d
+      description: storage class for the cloud pak deployer PVC
       default: "ocs-storagecluster-cephfs"
-    - name: block-storage-class
+    - name: custom-file-storage-class
       type: string
-      description: block storage class needed for cp4d
+      description: Custom RWX storage class needed for cp4d
+      default: "ocs-storagecluster-cephfs"
+    - name: custom-block-storage-class
+      type: string
+      description: Custom block storage class needed for cp4d
       default: "ocs-storagecluster-ceph-rbd"
     - name: cloud-pak-deployer-storage-class
       type: string
@@ -1504,6 +1508,15 @@ spec:
       params:
         - name: SCRIPT
           value: |
+
+            if [[ "$(params.cloud-pak-deployer-storage-type)" == "custom" ]]; then
+              custom_file_class_yml="ocp_storage_class_file: $(params.custom-file-storage-class)"
+              custom_block_class_yml="ocp_storage_class_block: $(params.custom-block-storage-class)"
+            else
+              custom_file_class_yml=""
+              custom_block_class_yml=""
+            fi
+
             oc apply -f - <<EOF
             apiVersion: v1
             kind: ConfigMap
@@ -1530,8 +1543,8 @@ spec:
                   openshift_storage:
                   - storage_name: $(params.cloud-pak-deployer-storage-class)
                     storage_type: $(params.cloud-pak-deployer-storage-type)
-                    ocp_storage_class_file: $(params.storage-class)
-                    ocp_storage_class_block: $(params.block-storage-class)
+                    $custom_file_class_yml
+                    $custom_block_class_yml
 
                 #
                 # All tested cartridges. To install, change the "state" property to "installed". To uninstall, change the state