diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/get-cr-status.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/get-cr-status.yml index ffacc2397..8d319fbde 100644 --- a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/get-cr-status.yml +++ b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/get-cr-status.yml @@ -24,7 +24,7 @@ - name: Create header line if CR status does not exist lineinfile: path: /tmp/work/status.csv - line: "Component,CR Kind,CR Name,Creation Timestamp,Namespace,Expected Version,Reconciled Version,Operator Information,Progress,Progress Message,Reconcile History,Status" + line: "Components,CR Kind,CR Name,Creation Timestamp,Namespace,Expected Version,Reconciled Version,Operator Information,Progress,Progress Message,Reconcile History,Status" insertbefore: "BOF" state: present create: True @@ -50,8 +50,9 @@ head -1 {{ _cp4d_get_cr_status_file }} register: _csv_column_headers_output +# Between CP4D 5.1.0 and 5.1.1, the Component column has been renamed to Components - set_fact: - _csv_column_headers: "{{ _csv_column_headers_output.stdout }}" + _csv_column_headers: "{{ _csv_column_headers_output.stdout | replace('Component,','Components,') | replace(' ','_') }}" # Try to copy the get-cr-status output file. In certain situations (Windows, SELinux), the command may fail and has to be re-run without remote_src - block: @@ -75,7 +76,7 @@ - name: Try to convert to json read_csv: path: "{{ _cp4d_get_cr_status_no_header_file }}" - fieldnames: "{{ _csv_column_headers | replace(' ','_') }}" + fieldnames: "{{ _csv_column_headers }}" skipinitialspace: True register: _get_cr_status_json diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/main.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/main.yml index 89c8261c3..5fee62599 100644 --- a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/main.yml +++ b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/tasks/main.yml @@ -94,7 +94,7 @@ }} _get_cr_status_json_item: >- {{ _get_cr_status_json.list - | selectattr('Component','equalto',item['olm_utils_name']) + | selectattr('Components','equalto',item['olm_utils_name']) | list | first | default([]) @@ -251,13 +251,13 @@ - set_fact: _obsolete_cartridges: >- {{ _get_cr_status_json.list - | rejectattr('Component','in',_surviving_cartridges_names) + | rejectattr('Components','in',_surviving_cartridges_names) | rejectattr('CR_Kind','in',_surviving_cartridges_crs) }} - set_fact: _obsolete_cartridges_names: >- {{ _obsolete_cartridges - | map(attribute='Component') }} + | map(attribute='Components') }} - debug: var: _obsolete_cartridges diff --git a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/vars/vars-cp4d-installation.yml b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/vars/vars-cp4d-installation.yml index 8ee6a00a3..ea3ec594a 100644 --- a/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/vars/vars-cp4d-installation.yml +++ b/automation-roles/50-install-cloud-pak/cp4d/cp4d-variables/vars/vars-cp4d-installation.yml @@ -277,6 +277,12 @@ cartridge_cr: cr_name: spss-sample cr_status_attribute: spssmodelerStatus cr_status_completed: Completed + - name: streamsets + olm_utils_name: streamsets + cr_cr: Streamsets + cr_name: ibm-streamsets + cr_status_attribute: streamsetsStatus + cr_status_completed: Complete - name: syntheticdata olm_utils_name: syntheticdata cr_cr: Syntheticdata diff --git a/docs/src/10-use-deployer/3-run/existing-openshift-console.md b/docs/src/10-use-deployer/3-run/existing-openshift-console.md index 3bc2d2cce..a4d57fe06 100644 --- a/docs/src/10-use-deployer/3-run/existing-openshift-console.md +++ b/docs/src/10-use-deployer/3-run/existing-openshift-console.md @@ -298,6 +298,10 @@ data: description: SPSS Modeler state: removed + - name: streamsets + description: IBM StreamSets + state: removed + - name: syntheticdata description: Synthetic Data Generator state: removed @@ -345,6 +349,7 @@ data: state: removed installation_options: tuning_disabled: true + lite_install: false models: - model_id: allam-1-13b-instruct state: removed diff --git a/sample-configurations/sample-dynamic/config-samples/cp4d-510.yaml b/sample-configurations/sample-dynamic/config-samples/cp4d-510.yaml index 8b6457e36..813705643 100644 --- a/sample-configurations/sample-dynamic/config-samples/cp4d-510.yaml +++ b/sample-configurations/sample-dynamic/config-samples/cp4d-510.yaml @@ -273,6 +273,7 @@ cp4d: state: removed installation_options: tuning_disabled: true + lite_install: false models: - model_id: allam-1-13b-instruct state: removed diff --git a/sample-configurations/sample-dynamic/config-samples/cp4d-511.yaml b/sample-configurations/sample-dynamic/config-samples/cp4d-511.yaml new file mode 100644 index 000000000..e09666ffd --- /dev/null +++ b/sample-configurations/sample-dynamic/config-samples/cp4d-511.yaml @@ -0,0 +1,467 @@ +--- +cp4d: +- project: cpd + openshift_cluster_name: "{{ env_id }}" + cp4d_version: 5.1.0 + cp4d_entitlement: + - cpd-enterprise + # - cpd-standard + # - cognos-analytics + # - data-product-hub + # - datastage + # - ikc-premium + # - ikc-standard + # - openpages + # - planning-analytics + # - product-master + # - speech-to-text + # - text-to-speech + # - watson-assistant + # - watson-discovery + # - watsonx-ai + # - watsonx-code-assistant-ansible + # - watsonx-code-assistant-z + # - watsonx-data + # - watsonx-gov-mm + # - watsonx-gov-rc + # - watsonx-orchestrate + cp4d_production_license: True + accept_licenses: False + db2u_limited_privileges: False + use_fs_iam: True + operators_project: cpd-operators + state: installed + cartridges: + - name: cp-foundation + license_service: + threads_per_core: 2 + + - name: lite + + - name: scheduler + state: removed + +# +# All tested cartridges. To install, change the "state" property to "installed". To uninstall, change the state +# to "removed" or comment out the entire cartridge. Make sure that the "-" and properties are aligned with the lite +# cartridge; the "-" is at position 3 and the property starts at position 5. +# +# If a cartridge has dependencies and you want to install it, you must ensure that the dependent cartridge is also +# installed. +# + + - name: analyticsengine + description: Analytics Engine Powered by Apache Spark + size: small + state: removed + + - name: bigsql + description: Db2 Big SQL + state: removed + + - name: ca + description: Cognos Analytics + size: small + instances: + - name: ca-instance + metastore_ref: ca-metastore + state: removed + + - name: dashboard + description: Cognos Dashboards + state: removed + + - name: datagate + description: Db2 Data Gate + state: removed + + - name: datalineage + description: IBM MANTA Data Lineage + size: small + state: removed + + - name: dataproduct + description: Data Product Hub + state: removed + + - name: datastage-ent + description: DataStage Enterprise + state: removed + + - name: datastage-ent-plus + description: DataStage Enterprise Plus + state: removed + # instances: + # - name: ds-instance + # # Optional settings + # description: "datastage ds-instance" + # size: medium + # storage_class: efs-nfs-client + # storage_size_gb: 60 + # # Custom Scale options + # scale_px_runtime: + # replicas: 2 + # cpu_request: 500m + # cpu_limit: 2 + # memory_request: 2Gi + # memory_limit: 4Gi + # scale_px_compute: + # replicas: 2 + # cpu_request: 1 + # cpu_limit: 3 + # memory_request: 4Gi + # memory_limit: 12Gi + + - name: db2 + description: Db2 OLTP + size: small + instances: + - name: ca-metastore + metadata_size_gb: 20 + data_size_gb: 20 + backup_size_gb: 20 + transactionlog_size_gb: 20 + state: removed + + - name: db2wh + description: Db2 Warehouse + state: removed + + - name: dmc + description: Db2 Data Management Console + state: removed + instances: + - name: data-management-console + description: Data Management Console + size: medium + storage_size_gb: 50 + + - name: dods + description: Decision Optimization + size: small + state: removed + + - name: dp + description: Data Privacy + size: small + state: removed + + - name: dpra + description: Data Privacy Risk Assessment + state: removed + + - name: dv + description: Data Virtualization + size: small + instances: + - name: data-virtualization + state: removed + + # Please note that for EDB Postgress, a secret edb-postgres-license-key must be created in the vault + # before deploying + - name: edb_cp4d + description: EDB Postgres + state: removed + instances: + - name: instance1 + version: "15.4" + #type: Standard + #members: 1 + #size_gb: 50 + #resource_request_cpu: 1 + #resource_request_memory: 4Gi + #resource_limit_cpu: 1 + #resource_limit_memory: 4Gi + + - name: factsheet + description: AI Factsheets + size: small + state: removed + + - name: hee + description: Execution Engine for Apache Hadoop + size: small + state: removed + + - name: mantaflow + description: MANTA Automated Lineage + size: small + state: removed + + - name: match360 + description: IBM Match 360 + size: small + wkc_enabled: true + state: removed + + - name: mongodb + description: MongoDB for Cloud Pak for Data + state: removed + + - name: openpages + description: OpenPages + state: removed + + # For Planning Analytics, the case version is needed due to defect in olm utils + - name: planning-analytics + description: Planning Analytics + state: removed + + - name: replication + description: Data Replication + license: IDRC + size: small + state: removed + + - name: rstudio + description: RStudio Server with R 3.6 + size: small + state: removed + + - name: spss + description: SPSS Modeler + state: removed + + - name: streamsets + description: IBM StreamSets + state: removed + + - name: syntheticdata + description: Synthetic Data Generator + state: removed + + - name: voice-gateway + description: Voice Gateway + replicas: 1 + state: removed + + # In case watsonx Orchestrate is installed, no instances must be created for Watson Assistant + - name: watson-assistant + description: Watson Assistant + size: small + # noobaa_account_secret: noobaa-admin + # noobaa_cert_secret: noobaa-s3-serving-cert + state: removed + # instances: + # - name: wa-instance + # description: "Watson Assistant instance" + + - name: watson-discovery + description: Watson Discovery + # noobaa_account_secret: noobaa-admin + # noobaa_cert_secret: noobaa-s3-serving-cert + state: removed + instances: + - name: wd-instance + description: "Watson Discovery instance" + + - name: watson-openscale + description: Watson OpenScale + size: small + state: removed + + - name: watson-speech + description: Watson Speech (STT and TTS) + stt_size: xsmall + tts_size: xsmall + # noobaa_account_secret: noobaa-admin + # noobaa_cert_secret: noobaa-s3-serving-cert + state: removed + + # Please note that for watsonx.ai, the following pre-requisites exist: + # If you want to use foundation models, you neeed to install the Node Feature Discovery and NVIDIA GPU operators. + # You can do so by setting the openshift.gpu.install property to True + # OpenShift AI is a requirement for watsonx.ai. You can install this by setting the openshift.openshift_ai.install property to True + - name: watsonx_ai + description: watsonx.ai + state: removed + installation_options: + tuning_disabled: true + lite_install: false + models: + - model_id: allam-1-13b-instruct + state: removed + - model_id: codellama-codellama-34b-instruct-hf + state: removed + - model_id: codestral-22b + state: removed + - model_id: elyza-japanese-llama-2-7b-instruct + state: removed + - model_id: google-flan-ul2 + state: removed + - model_id: google-flan-t5-xl + state: removed + - model_id: google-flan-t5-xxl + state: removed + - model_id: ibm-granite-7b-lab + state: removed + - model_id: ibm-granite-8b-japanese + state: removed + - model_id: ibm-granite-13b-chat-v2 + state: removed + - model_id: ibm-granite-13b-instruct-v2 + state: removed + - model_id: ibm-granite-20b-multilingual + state: removed + - model_id: granite-3-2b-instruct + state: removed + - model_id: granite-3-8b-instruct + state: removed + - model_id: granite-guardian-3-2b-instruct + state: removed + - model_id: granite-guardian-3-8b-instruct + state: removed + - model_id: granite-3b-code-instruct + state: removed + - model_id: granite-8b-code-instruct + state: removed + - model_id: granite-20b-code-instruct + state: removed + - model_id: granite-20b-code-base-schema-linking + state: removed + - model_id: granite-20b-code-base-sql-gen + state: removed + - model_id: granite-34b-code-instruct + state: removed + - model_id: core42-jais-13b-chat + state: removed + - model_id: llama-3-2-1b-instruct + state: removed + - model_id: llama-3-2-3b-instruct + state: removed + - model_id: llama-3-2-11b-vision-instruct + state: removed + - model_id: llama-3-2-90b-vision-instruct + state: removed + - model_id: llama-guard-3-11b-vision + state: removed + - model_id: llama-3-1-8b-instruct + state: removed + - model_id: llama-3-1-70b-instruct + state: removed + - model_id: llama-3-405b-instruct + state: removed + - model_id: meta-llama-llama-3-8b-instruct + state: removed + - model_id: meta-llama-llama-3-70b-instruct + state: removed + - model_id: meta-llama-llama-2-13b-chat + state: removed + - model_id: mncai-llama-2-13b-dpo-v7 + state: removed + - model_id: ministral-8b-instruct + state: removed + - model_id: mistral-small-instruct + state: removed + - model_id: mistral-large + state: removed + - model_id: mistralai-mixtral-8x7b-instruct-v01 + state: removed + - model_id: bigscience-mt0-xxl + state: removed + - model_id: pixtral-12b + state: removed + # Embedding models + - model_id: all-minilm-l6-v2 + state: removed + - model_id: all-minilm-l12-v2 + state: removed + - model_id: ms-marco-minilm-l-12-v2 + state: removed + - model_id: multilingual-e5-large + state: removed + - model_id: ibm-slate-30m-english-rtrvr + state: removed + - model_id: ibm-slate-125m-english-rtrvr + state: removed + + - name: watsonx_data + description: watsonx.data + state: removed + + - name: watsonx_governance + description: watsonx.governance + state: removed + installation_options: + installType: all + enableFactsheet: true + enableOpenpages: true + enableOpenscale: true + + - name: watsonx_orchestrate + description: watsonx.orchestrate + app_connect: + app_connect_project: ibm-app-connect + app_connect_case_version: 12.5.0 + app_connect_channel_version: v12.5 + state: removed + + - name: wca-ansible + description: watsxonx Code Assistant for Red Hat Ansible Lightspeed + state: removed + + - name: wca-z + description: watsxonx Code Assistant for Z + state: removed + + # For the IBM Knowledge Catalog, you can specify 3 editions: wkx, ikc_premium, or ikc_standard + # Choose the correct IBM Knowledge Catalog edition below + - name: wkc + description: IBM Knowledge Catalog + size: small + state: removed + installation_options: + enableKnowledgeGraph: True + enableDataQuality: True + + - name: ikc_premium + description: IBM Knowledge Catalog - Premium edition + size: small + state: removed + installation_options: + enableKnowledgeGraph: True + enableDataQuality: True + + - name: ikc_standard + description: IBM Knowledge Catalog - Standard edition + size: small + state: removed + installation_options: + enableKnowledgeGraph: True + enableDataQuality: True + + - name: wml + description: Watson Machine Learning + size: small + state: installed + + - name: wml-accelerator + description: Watson Machine Learning Accelerator + replicas: 1 + size: small + state: removed + + - name: ws + description: Watson Studio + state: installed + + - name: ws-pipelines + description: Watson Studio Pipelines + state: removed + + - name: ws-runtimes + description: Watson Studio Runtimes + runtimes: + - ibm-cpd-ws-runtime-241-py + - ibm-cpd-ws-runtime-241-pygpu + - ibm-cpd-ws-runtime-241-r + state: removed + +# +# Cartridges where extra work is needed (will not install automatically) +# + # Product Master requires set up of the Db2 instance secret before install + - name: productmaster + description: Product Master + size: small + state: removed