Merge pull request #766 from IBM/cp4ba-20240822

CP4BA 20240822
IBM · Aug 23, 2024 · 3bd626d · 3bd626d
2 parents a6db878 + 8644efd
commit 3bd626d
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 104 deletions.
diff --git a/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/tasks/deploy.yml b/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/tasks/deploy.yml
@@ -429,7 +429,7 @@
     src: "{{ cp4ba_output_directory }}/cr.yaml"
 
 - name: Wait for Kafka
-  when: _current_cp4ba_cluster.cp4ba.patterns.foundation.optional_components.bai
+  when: _current_cp4ba_cluster.cp4ba.patterns.workflow.optional_components.kafka or _current_cp4ba_cluster.cp4ba.patterns.foundation.optional_components.bai
   block:
     - name: Wait for Kafka instance Ready state
       ansible.builtin.include_role:

diff --git a/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/tasks/postdeploy/cpfs.yml b/automation-roles/50-install-cloud-pak/cp4ba/cp4ba-core/tasks/postdeploy/cpfs.yml
@@ -115,57 +115,62 @@
     common_pg_password: "{{ im_pg_password }}"
   when: _current_cp4ba_cluster.cloudbeaver_enabled
 
-- name: Get BTS PostgreSQL secret
-  kubernetes.core.k8s_info:
-    api_version: v1
-    kind: Secret
-    namespace: "{{ cp4ba_project_name }}"
-    name: "ibm-bts-cnpg-{{ cp4ba_project_name }}-cp4ba-bts-app"
-  register: bts_pg_secret
-  retries: 40
-  delay: 15
+- name: When BTS enabled
+  when: _current_cp4ba_cluster.cp4ba.patterns.foundation.optional_components.bai or
+    _current_cp4ba_cluster.cp4ba.patterns.document_processing.optional_components.document_processing_designer or
+    _current_cp4ba_cluster.cp4ba.patterns.application.enabled
+  block:
+    - name: Get BTS PostgreSQL secret
+      kubernetes.core.k8s_info:
+        api_version: v1
+        kind: Secret
+        namespace: "{{ cp4ba_project_name }}"
+        name: "ibm-bts-cnpg-{{ cp4ba_project_name }}-cp4ba-bts-app"
+      register: bts_pg_secret
+      retries: 40
+      delay: 15
 
-- name: Set BTS PosgreSQL password
-  ansible.builtin.set_fact:
-    bts_pg_password: "{{ bts_pg_secret.resources[0].data.password | b64decode }}"
+    - name: Set BTS PosgreSQL password
+      ansible.builtin.set_fact:
+        bts_pg_password: "{{ bts_pg_secret.resources[0].data.password | b64decode }}"
 
-- name: Add PG to cloudbeaver
-  ansible.builtin.include_role:
-    name: common
-    tasks_from: cloudbeaver-add-pg
-  vars:
-    common_cloudbeaver_project: "{{ cp4ba_cloudbeaver_project }}"
-    common_cloudbeaver_username: "{{ lc_principal_admin_user }}"
-    common_cloudbeaver_password: "{{ cp4ba_cloudbeaver_universal_password }}"
-    common_cloudbeaver_connection_name: BTS PostgreSQL
-    common_pg_host: "ibm-bts-cnpg-{{ cp4ba_project_name }}-{{ cp4ba_project_name }}-bts-rw.{{ cp4ba_project_name }}.svc.cluster.local"
-    common_pg_port: "5432"
-    common_pg_username: postgresadmin
-    common_pg_password: "{{ bts_pg_password }}"
-  when: _current_cp4ba_cluster.cloudbeaver_enabled
-
-- name: Set usage entry for BTS
-  ansible.builtin.include_role:
-    name: usage
-    tasks_from: set-entry
-  vars:
-    usage_entry_name: CP4BA-CPFS-Business-Teams-Service-BTS
-    usage_entry_value:
-      "# Business Teams Service (BTS)
+    - name: Add PG to cloudbeaver
+      ansible.builtin.include_role:
+        name: common
+        tasks_from: cloudbeaver-add-pg
+      vars:
+        common_cloudbeaver_project: "{{ cp4ba_cloudbeaver_project }}"
+        common_cloudbeaver_username: "{{ lc_principal_admin_user }}"
+        common_cloudbeaver_password: "{{ cp4ba_cloudbeaver_universal_password }}"
+        common_cloudbeaver_connection_name: BTS PostgreSQL
+        common_pg_host: "ibm-bts-cnpg-{{ cp4ba_project_name }}-{{ cp4ba_project_name }}-bts-rw.{{ cp4ba_project_name }}.svc.cluster.local"
+        common_pg_port: "5432"
+        common_pg_username: postgresadmin
+        common_pg_password: "{{ bts_pg_password }}"
+      when: _current_cp4ba_cluster.cloudbeaver_enabled
+
+    - name: Set usage entry for BTS
+      ansible.builtin.include_role:
+        name: usage
+        tasks_from: set-entry
+      vars:
+        usage_entry_name: CP4BA-CPFS-Business-Teams-Service-BTS
+        usage_entry_value:
+          "# Business Teams Service (BTS)
 
-      ## Endpoints
+          ## Endpoints
 
-      - Admin UI: https://cpd-{{ cp4ba_project_name }}.{{ apps_endpoint_domain }}/teamserver/ui
+          - Admin UI: https://cpd-{{ cp4ba_project_name }}.{{ apps_endpoint_domain }}/teamserver/ui
 
-      - API Explorer: https://cpd-{{ cp4ba_project_name }}.{{ apps_endpoint_domain }}/teamserver/api/explorer
+          - API Explorer: https://cpd-{{ cp4ba_project_name }}.{{ apps_endpoint_domain }}/teamserver/api/explorer
 
-      - Teams API: https://cpd-{{ cp4ba_project_name }}.{{ apps_endpoint_domain }}/teamserver/rest
+          - Teams API: https://cpd-{{ cp4ba_project_name }}.{{ apps_endpoint_domain }}/teamserver/rest
 
-      ## Credentials
+          ## Credentials
 
-      - {{ lc_principal_admin_user }} / {{ lc_principal_admin_password }}
+          - {{ lc_principal_admin_user }} / {{ lc_principal_admin_password }}
 
-      "
+          "
 
 - name: Set usage entry for Zen
   ansible.builtin.include_role:
@@ -186,84 +191,88 @@
 
       "
 
-- name: Get OpenSearch password secret
-  kubernetes.core.k8s_info:
-    api_version: v1
-    kind: Secret
-    namespace: "{{ cp4ba_project_name }}"
-    name: "opensearch-ibm-elasticsearch-cred-secret"
-  register: os_secret
-  retries: 40
-  delay: 15
+- name: When OpenSearch is enabled
+  when: _current_cp4ba_cluster.cp4ba.patterns.workflow.enabled or _current_cp4ba_cluster.cp4ba.patterns.foundation.optional_components.bai
+  block:
+    - name: Get OpenSearch password secret
+      kubernetes.core.k8s_info:
+        api_version: v1
+        kind: Secret
+        namespace: "{{ cp4ba_project_name }}"
+        name: "opensearch-ibm-elasticsearch-cred-secret"
+      register: os_secret
+      retries: 40
+      delay: 15
 
-- name: Set OpenSearch password
-  ansible.builtin.set_fact:
-    os_password: "{{ os_secret.resources[0].data.elastic | b64decode }}"
+    - name: Set OpenSearch password
+      ansible.builtin.set_fact:
+        os_password: "{{ os_secret.resources[0].data.elastic | b64decode }}"
 
-- name: Set usage entry for OpenSearch
-  ansible.builtin.include_role:
-    name: usage
-    tasks_from: set-entry
-  vars:
-    usage_entry_name: CP4BA-CPFS-OpenSearch
-    usage_entry_value:
-      "# OpenSearch
+    - name: Set usage entry for OpenSearch
+      ansible.builtin.include_role:
+        name: usage
+        tasks_from: set-entry
+      vars:
+        usage_entry_name: CP4BA-CPFS-OpenSearch
+        usage_entry_value:
+          "# OpenSearch
 
-      ## Endpoints
+          ## Endpoints
 
-      - OpenSearch: https://opensearch-{{ cp4ba_project_name }}.{{ apps_endpoint_domain }}
+          - OpenSearch: https://opensearch-{{ cp4ba_project_name }}.{{ apps_endpoint_domain }}
 
-      ## Credentials
+          ## Credentials
 
-      - elastic / {{ os_password }}
+          - elastic / {{ os_password }}
 
-      "
-  when: _current_cp4ba_cluster.cp4ba.patterns.workflow.enabled or _current_cp4ba_cluster.cp4ba.patterns.foundation.optional_components.bai
+          "
 
-- name: Get OpenSearch password secret
-  kubernetes.core.k8s_info:
-    api_version: v1
-    kind: Secret
-    namespace: "{{ cp4ba_project_name }}"
-    name: "icp4ba-kafka-auth-0"
-  register: kafka_secret
-  retries: 40
-  delay: 15
+- name: When Kafka is enabled
+  when: _current_cp4ba_cluster.cp4ba.patterns.workflow.optional_components.kafka or _current_cp4ba_cluster.cp4ba.patterns.foundation.optional_components.bai
+  block:
+    - name: Get Kafka password secret
+      kubernetes.core.k8s_info:
+        api_version: v1
+        kind: Secret
+        namespace: "{{ cp4ba_project_name }}"
+        name: "icp4ba-kafka-auth-0"
+      register: kafka_secret
+      retries: 40
+      delay: 15
 
-- name: Set OpenSearch password
-  ansible.builtin.set_fact:
-    kafka_password: "{{ kafka_secret.resources[0].data.password | b64decode }}"
+    - name: Set Kafka password
+      ansible.builtin.set_fact:
+        kafka_password: "{{ kafka_secret.resources[0].data.password | b64decode }}"
 
-- name: Set usage entry for Kafka
-  ansible.builtin.include_role:
-    name: usage
-    tasks_from: set-entry
-  vars:
-    usage_entry_name: CP4BA-CPFS-Kafka
-    usage_entry_value:
-      "# Kafka
+    - name: Set usage entry for Kafka
+      ansible.builtin.include_role:
+        name: usage
+        tasks_from: set-entry
+      vars:
+        usage_entry_name: CP4BA-CPFS-Kafka
+        usage_entry_value:
+          "# Kafka
 
-      ## Endpoints
+          ## Endpoints
 
-      - Kafka: iaf-system-kafka-bootstrap-{{ cp4ba_project_name }}.{{ apps_endpoint_domain }}:443
+          - Kafka: iaf-system-kafka-bootstrap-{{ cp4ba_project_name }}.{{ apps_endpoint_domain }}:443
 
-      ## Credentials
+          ## Credentials
 
-      - icp4ba-kafka-auth-0 / {{ kafka_password }} (username: ```oc get kafkauser icp4ba-kafka-auth-0 -n {{ cp4ba_project_name }} \
-      -o jsonpath='{.status.username}'```, password: ```oc get secret -n {{ cp4ba_project_name }} \
-      $(oc get kafkauser icp4ba-kafka-auth-0 -n {{ cp4ba_project_name }} -o jsonpath='{.status.secret}') \
-      -o jsonpath='{.data.password}' | base64 -d```)
+          - icp4ba-kafka-auth-0 / {{ kafka_password }} (username: ```oc get kafkauser icp4ba-kafka-auth-0 -n {{ cp4ba_project_name }} \
+          -o jsonpath='{.status.username}'```, password: ```oc get secret -n {{ cp4ba_project_name }} \
+          $(oc get kafkauser icp4ba-kafka-auth-0 -n {{ cp4ba_project_name }} -o jsonpath='{.status.secret}') \
+          -o jsonpath='{.data.password}' | base64 -d```)
 
-      - Alternative custom user: cpadmin / {{ universal_password }}
+          - Alternative custom user: cpadmin / {{ universal_password }}
 
-      ## Configuration for Kafka connection
+          ## Configuration for Kafka connection
 
-      - Security protocol: Sasl Ssl
+          - Security protocol: Sasl Ssl
 
-      - Sasl Mechanism: SCRAM-SHA-512
+          - Sasl Mechanism: SCRAM-SHA-512
 
-      - Root CA cert (used in *Path to root CA certificates file*): \
-      ```oc get kafka iaf-system -n {{ cp4ba_project_name }} -o jsonpath='{.status.listeners[1].certificates[0]}'```
+          - Root CA cert (used in *Path to root CA certificates file*): \
+          ```oc get kafka iaf-system -n {{ cp4ba_project_name }} -o jsonpath='{.status.listeners[1].certificates[0]}'```
 
-      "
-  when: _current_cp4ba_cluster.cp4ba.patterns.workflow.enabled or _current_cp4ba_cluster.cp4ba.patterns.foundation.optional_components.bai
+          "