PyPI - mas-cli - Versions diffs - 13.24.0__py3-none-any.whl → 13.25.1__py3-none-any.whl - Mend

mas-cli 13.24.0py3-none-any.whl → 13.25.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of mas-cli might be problematic. Click here for more details.

Files changed (16) hide show

mas/cli/__init__.py +1 -1
mas/cli/cli.py +4 -1
mas/cli/install/app.py +93 -7
mas/cli/install/argBuilder.py +46 -1
mas/cli/install/argParser.py +104 -0
mas/cli/install/params.py +15 -0
mas/cli/install/settings/additionalConfigs.py +4 -0
mas/cli/install/settings/db2Settings.py +32 -9
mas/cli/install/summarizer.py +25 -0
mas/cli/templates/ibm-mas-tekton.yaml +1408 -551
mas/cli/upgrade/app.py +1 -0
{mas_cli-13.24.0.dist-info → mas_cli-13.25.1.dist-info}/METADATA +1 -1
{mas_cli-13.24.0.dist-info → mas_cli-13.25.1.dist-info}/RECORD +16 -16
{mas_cli-13.24.0.dist-info → mas_cli-13.25.1.dist-info}/WHEEL +1 -1
{mas_cli-13.24.0.data → mas_cli-13.25.1.data}/scripts/mas-cli +0 -0
{mas_cli-13.24.0.dist-info → mas_cli-13.25.1.dist-info}/top_level.txt +0 -0

mas/cli/templates/ibm-mas-tekton.yaml CHANGED Viewed

@@ -231,7 +231,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aibroker
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/appconnect.yaml
@@ -342,7 +342,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -460,7 +460,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -530,7 +530,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -596,7 +596,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -723,7 +723,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -843,7 +843,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -960,7 +960,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -1066,7 +1066,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1388,7 +1388,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -1498,7 +1498,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -1587,7 +1587,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -1691,7 +1691,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -1773,7 +1773,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2078,7 +2078,7 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2186,7 +2186,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2334,7 +2334,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2463,7 +2463,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2754,7 +2754,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -2852,7 +2852,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2979,7 +2979,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3077,7 +3077,7 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -3169,7 +3169,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3254,7 +3254,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3339,7 +3339,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3458,7 +3458,7 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3551,7 +3551,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -3634,7 +3634,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -3751,7 +3751,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -3861,7 +3861,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3964,7 +3964,7 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -4021,7 +4021,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4226,7 +4226,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -4324,7 +4324,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4416,7 +4416,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4628,7 +4628,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4721,7 +4721,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4812,7 +4812,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4905,7 +4905,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -5018,7 +5018,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5145,7 +5145,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -5280,7 +5280,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -5376,7 +5376,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -5498,7 +5498,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5624,7 +5624,7 @@ spec:
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: shared-entitlement
@@ -6343,7 +6343,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -6836,7 +6836,7 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6944,7 +6944,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -7070,7 +7070,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7188,7 +7188,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7244,7 +7244,7 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7431,7 +7431,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7589,7 +7589,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -7695,7 +7695,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: certificates
@@ -7870,7 +7870,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -7970,7 +7970,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
@@ -8094,7 +8094,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -8195,7 +8195,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8617,7 +8617,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8737,7 +8737,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -8839,7 +8839,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -9182,7 +9182,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -9232,7 +9232,7 @@ spec:
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -9366,7 +9366,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -9608,7 +9608,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -9824,7 +9824,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kmodels
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
@@ -10002,7 +10002,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -10045,7 +10045,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -10162,7 +10162,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -10198,7 +10198,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10240,7 +10240,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10282,7 +10282,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10324,7 +10324,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10366,7 +10366,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -10492,7 +10492,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -10560,7 +10560,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -10796,7 +10796,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - odh
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -10972,7 +10972,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -11211,6 +11211,61 @@ spec:
       type: string
       description: Optional. Url to access WML service (same as Cloud Pak for Data url)
       default: ""
+    # Application Workspace - Operand (Real Estate and Facilities)
+    # TODO: Fix type for storage sizes and max conn pool size
+    - name: mas_ws_facilities_size
+      type: string
+      description: Size of the Facilities Deployment
+      default: ""
+    - name: mas_ws_facilities_routes_timeout
+      type: string
+      description: Optional. Connection timeout of the route.
+      default: ""
+    - name: mas_ws_facilities_liberty_extension_XML
+      type: string
+      description: Optional. Secret name containing XML extension for server.xml
+      default: ""
+    - name: mas_ws_facilities_vault_secret
+      type: string
+      description: Optional. Secret name containing AES encryption secret.
+      default: ""
+    - name: mas_ws_facilities_pull_policy
+      type: string
+      description: Optional. Pull Policy
+      default: ""
+    - name: mas_ws_facilities_storage_log_class
+      type: string
+      description: Define storage class for log
+      default: ""
+    - name: mas_ws_facilities_storage_log_mode
+      type: string
+      description: Define storage mode for log
+      default: ""
+    # - name: mas_ws_facilities_storage_log_size
+    #   description: Define storage size for log
+    #   type: string
+    #   default: ""
+    - name: mas_ws_facilities_storage_userfiles_class
+      type: string
+      description: Define storage class for userfiles
+      default: ""
+    - name: mas_ws_facilities_storage_userfiles_mode
+      type: string
+      description: Define storage mode for userfiles
+      default: ""
+    # - name: mas_ws_facilities_storage_userfiles_size
+    #   description: Define storage size for userfiles
+    #   type: string
+    #   default: ""
+    # - name: mas_ws_facilities_dwfagents
+    #   type: array
+    #   description: Define a list of dedicated workflow agents
+    #   default: []
+    # - name: mas_ws_facilities_db_maxconnpoolsize
+    #   description: Define maximum connection pool size
+    #   type: string
+    #   default: ""
     # Custom Label Support
     - name: custom_labels
@@ -11357,6 +11412,35 @@ spec:
         value: $(params.cpd_wml_instance_id)
       - name: CPD_WML_URL
         value: $(params.cpd_wml_url)
+      # Application Workspace - Operand (Real Estate and Facilities)
+      # TODO: Fix type for storage sizes and max conn pool size
+      - name: MAS_FACILITIES_SIZE
+        value: $(params.mas_ws_facilities_size)
+      - name: MAS_FACILITIES_ROUTES_TIMEOUT
+        value: $(params.mas_ws_facilities_routes_timeout)
+      - name: MAS_FACILITIES_LIBERTY_EXTENSION_XML_SECRET_NAME
+        value: $(params.mas_ws_facilities_liberty_extension_XML)
+      - name: MAS_FACILITIES_VAULT_SECRET_NAME
+        value: $(params.mas_ws_facilities_vault_secret)
+      - name: MAS_FACILITIES_PULL_POLICY
+        value: $(params.mas_ws_facilities_pull_policy)
+      - name: MAS_FACILITIES_STORAGE_LOG_CLASS
+        value: $(params.mas_ws_facilities_storage_log_class)
+      - name: MAS_FACILITIES_STORAGE_LOG_MODE
+        value: $(params.mas_ws_facilities_storage_log_mode)
+      # - name: MAS_FACILITIES_STORAGE_LOG_SIZE
+      #   value: $(params.mas_ws_facilities_storage_log_size)
+      - name: MAS_FACILITIES_STORAGE_USERFILES_CLASS
+        value: $(params.mas_ws_facilities_storage_userfiles_class)
+      - name: MAS_FACILITIES_STORAGE_USERFILES_MODE
+        value: $(params.mas_ws_facilities_storage_userfiles_mode)
+      # - name: MAS_FACILITIES_STORAGE_USERFILES_SIZE
+      #   value: $(params.mas_ws_facilities_storage_userfiles_size)
+      # - name: MAS_FACILITIES_DWFAGENTS
+      #   value: $(params.mas_ws_facilities_dwfagents)
+      # - name: MAS_FACILITIES_DB_MAX_POOLSIZE
+      #   value: $(params.mas_ws_facilities_db_maxconnpoolsize)
       # Custom Label Support
       - name: CUSTOM_LABELS
@@ -11367,12 +11451,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -11567,7 +11651,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
   workspaces:
@@ -11656,7 +11740,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -11719,7 +11803,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -11794,7 +11878,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -11895,7 +11979,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -12038,7 +12122,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
   workspaces:
@@ -12105,20 +12189,20 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
-# /home/runner/work/cli/cli/tekton/target/tasks/suite-db2-setup-for-manage.yaml
+# /home/runner/work/cli/cli/tekton/target/tasks/suite-db2-setup-for-facilities.yaml
 # --------------------------------------------------------------------------------
 ---
 apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
-  name: mas-devops-suite-db2-setup-for-manage
+  name: mas-devops-suite-db2-setup-for-facilities
 spec:
   params:
     # Common: Control the image pull policy for the CLI container image
@@ -12133,155 +12217,167 @@ spec:
       default: ""
-    - name: db2_instance_name
-      type: string
-      description: Name (specifically, not the ID) of the DB2 Warehouse instance to execute the hack
-    - name: db2_namespace
+    # Entitlement
+    - name: ibm_entitlement_key
       type: string
-      description: Namespace where the DB2 Warehouse instance to execute the hack resides
-      default: "db2u"
-  stepTemplate:
-    env:
-      - name: DEVOPS_MONGO_URI
-        valueFrom:
-          secretKeyRef:
-            name: mas-devops
-            key: DEVOPS_MONGO_URI
-            optional: true
-      - name: DEVOPS_BUILD_NUMBER
-        valueFrom:
-          secretKeyRef:
-            name: mas-devops
-            key: DEVOPS_BUILD_NUMBER
-            optional: true
-      - name: DEVOPS_ENVIRONMENT
-        valueFrom:
-          secretKeyRef:
-            name: mas-devops
-            key: MAS_INSTANCE_ID
-            optional: true
-      - name: DEVOPS_SUITE_NAME
-        value: $(params.devops_suite_name)
-      # General
-      - name: DB2_INSTANCE_NAME
-        value: $(params.db2_instance_name)
-      - name: DB2_NAMESPACE
-        value: $(params.db2_namespace)
+      default: ""
-  steps:
-    - name: suite-db2-setup-for-manage
-      command:
-        - /opt/app-root/src/run-role.sh
-        - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:13.24.0
-      imagePullPolicy: $(params.image_pull_policy)
-# --------------------------------------------------------------------------------
-# /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
-# --------------------------------------------------------------------------------
----
-apiVersion: tekton.dev/v1beta1
-kind: Task
-metadata:
-  name: mas-devops-suite-dns
-spec:
-  params:
-    # Common: Control the image pull policy for the CLI container image
-    - name: image_pull_policy
+    - name: db2_action_facilities
       type: string
-      default: IfNotPresent
+      description: Set to 'install' to set up Db2 instance for Facilities
+      default: "none"
-    # Common: Support for saving task execution results to a MongoDb instance
-    - name: devops_suite_name
+    # Db2u Operator
+    - name: db2_channel
       type: string
-      description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
+      description: Subscription channel for the Db2 Universal Operator
+      default: ""
+    - name: db2_action
+      type: string
+      description: Action to perform for db2u such as install or upgrade
       default: ""
+    # Db2 - Instance
+    - name: db2_namespace
+      type: string
+      description: Namespace to create Db2uCluster instances
+      default: ""
+    - name: db2_instance_name
+      type: string
+      default: ""
+    - name: db2_dbname
+      type: string
+      default: ""
+    - name: db2_version
+      type: string
+      default: ""
+    - name: db2_type
+      type: string
+      default: ""
+    - name: db2_timezone
+      type: string
+      default: ""
+    - name: db2_workload
+      type: string
+      default: ""
+    - name: db2_4k_device_support
+      type: string
+      default: ""
+    - name: db2_table_org
+      type: string
+      default: ""
-    - name: dns_provider
+    # Db2 - Node scheduling
+    - name: db2_affinity_key
       type: string
       default: ""
-    - name: mas_instance_id
+    - name: db2_affinity_value
       type: string
-    - name: custom_labels
+      default: ""
+    - name: db2_tolerate_key
       type: string
-      description: Optional MAS custom labels, comma separated list of key=value pairs
       default: ""
-    - name: mas_domain
+    - name: db2_tolerate_value
       type: string
       default: ""
-    - name: mas_workspace_id
+    - name: db2_tolerate_effect
       type: string
       default: ""
-    # Cloudflare support
-    - name: cloudflare_email
+    # Db2 - CPU requests and limits
+    - name: db2_cpu_requests
       type: string
       default: ""
-    - name: cloudflare_apitoken
+    - name: db2_cpu_limits
       type: string
       default: ""
-    - name: cloudflare_zone
+    # Db2 - Memory requests and limits
+    - name: db2_memory_requests
       type: string
       default: ""
-    - name: cloudflare_subdomain
+    - name: db2_memory_limits
       type: string
       default: ""
-    # IBM Cloud Internet Services support
-    - name: cis_email
+    # Db2 - Storage - Capacity
+    - name: db2_meta_storage_size
       type: string
       default: ""
-    - name: cis_apikey
+    - name: db2_data_storage_size
       type: string
       default: ""
-    - name: cis_crn
+    - name: db2_backup_storage_size
       type: string
       default: ""
-    - name: cis_subdomain
+    - name: db2_logs_storage_size
+      type: string
+      default: ""
+    - name: db2_temp_storage_size
       type: string
       default: ""
-    # IBM Cloud Internet Services support Security Enhancement support
-    - name: cis_service_name
+    # Db2 - Storage - Class
+    - name: db2_meta_storage_class
       type: string
       default: ""
-    - name: cis_enhanced_security
+    - name: db2_data_storage_class
       type: string
       default: ""
-    - name: override_edge_certs
+    - name: db2_backup_storage_class
       type: string
-      default: "false"
-    - name: cis_proxy
+      default: ""
+    - name: db2_logs_storage_class
+      type: string
+      default: ""
+    - name: db2_temp_storage_class
       type: string
       default: ""
-    # AWS Route 53 support
-    - name: aws_access_key_id
+    # Db2 - Storage - Access Mode
+    - name: db2_meta_storage_accessmode
       type: string
       default: ""
-    - name: aws_secret_access_key
+    - name: db2_data_storage_accessmode
       type: string
       default: ""
-    - name: route53_hosted_zone_name
+    - name: db2_backup_storage_accessmode
       type: string
       default: ""
-    - name: route53_hosted_zone_region
+    - name: db2_logs_storage_accessmode
       type: string
       default: ""
-    - name: route53_email
+    - name: db2_temp_storage_accessmode
       type: string
       default: ""
-    - name: route53_subdomain
+    # Db2 - LDAP
+    - name: db2_ldap_username
+      type: string
+      default: ""
+    - name: db2_ldap_password
       type: string
       default: ""
-    # Use of Manual Certificates
-    - name: mas_manual_cert_mgmt
+    # JDBCCfg
+    - name: mas_config_scope
       type: string
-      description: Optional boolean parameter that when set to True, indicates that manually created certificates will be used to certify MAS and application routes
+      default: ""
+    - name: mas_instance_id
+      type: string
+      description: Instance ID
+      default: ""
+    - name: mas_workspace_id
+      type: string
+      default: ""
+    - name: mas_application_id
+      type: string
+      default: ""
+    # Custom Labels support
+    - name: custom_labels
+      type: string
+      description: Optional MAS custom labels, comma separated list of key=value pairs
       default: ""
   stepTemplate:
@@ -12308,36 +12404,357 @@ spec:
         value: $(params.devops_suite_name)
-      # General
-      - name: DNS_PROVIDER
-        value: $(params.dns_provider)
-      - name: MAS_INSTANCE_ID
-        value: $(params.mas_instance_id)
-      - name: MAS_WORKSPACE_ID
-        value: $(params.mas_workspace_id)
-      - name: CUSTOM_LABELS
-        value: $(params.custom_labels)
-      - name: MAS_DOMAIN
-        value: $(params.mas_domain)
+      # Entitlement
+      - name: IBM_ENTITLEMENT_KEY
+        value: $(params.ibm_entitlement_key)
-      - name: CLOUDFLARE_EMAIL
-        value: $(params.cloudflare_email)
-      - name: CLOUDFLARE_APITOKEN
-        value: $(params.cloudflare_apitoken)
-      - name: CLOUDFLARE_ZONE
-        value: $(params.cloudflare_zone)
-      - name: CLOUDFLARE_SUBDOMAIN
-        value: $(params.cloudflare_subdomain)
+      # Db2u Operator
+      - name: DB2_CHANNEL
+        value: $(params.db2_channel)
+      - name: DB2_ACTION
+        value: $(params.db2_action)
-      - name: CIS_EMAIL
-        value: $(params.cis_email)
-      - name: CIS_APIKEY
-        value: $(params.cis_apikey)
-      - name: CIS_CRN
-        value: $(params.cis_crn)
-      - name: CIS_SUBDOMAIN
-        value: $(params.cis_subdomain)
-      - name: CIS_SERVICE_NAME
+      # Db2 - Instance
+      - name: DB2_NAMESPACE
+        value: $(params.db2_namespace)
+      - name: DB2_INSTANCE_NAME
+        value: $(params.db2_instance_name)
+      - name: DB2_DBNAME
+        value: $(params.db2_dbname)
+      - name: DB2_VERSION
+        value: $(params.db2_version)
+      - name: DB2_TYPE
+        value: $(params.db2_type)
+      - name: DB2_TIMEZONE
+        value: $(params.db2_timezone)
+      - name: DB2_WORKLOAD
+        value: $(params.db2_workload)
+      - name: DB2_4K_DEVICE_SUPPORT
+        value: $(params.db2_4k_device_support)
+      - name: DB2_TABLE_ORG
+        value: $(params.db2_table_org)
+      # Db2 - Node Scheduling
+      - name: DB2_AFFINITY_KEY
+        value: $(params.db2_affinity_key)
+      - name: DB2_AFFINITY_VALUE
+        value: $(params.db2_affinity_value)
+      - name: DB2_TOLERATE_KEY
+        value: $(params.db2_tolerate_key)
+      - name: DB2_TOLERATE_VALUE
+        value: $(params.db2_tolerate_value)
+      - name: DB2_TOLERATE_EFFECT
+        value: $(params.db2_tolerate_effect)
+      # Db2 - CPU requests and limits
+      - name: DB2_CPU_REQUESTS
+        value: $(params.db2_cpu_requests)
+      - name: DB2_CPU_LIMITS
+        value: $(params.db2_cpu_limits)
+      # Db2 - Memory requests and limits
+      - name: DB2_MEMORY_REQUESTS
+        value: $(params.db2_memory_requests)
+      - name: DB2_MEMORY_LIMITS
+        value: $(params.db2_memory_limits)
+      # Db2 - Storage - Capacity
+      - name: DB2_META_STORAGE_SIZE
+        value: $(params.db2_meta_storage_size)
+      - name: DB2_DATA_STORAGE_SIZE
+        value: $(params.db2_data_storage_size)
+      - name: DB2_BACKUP_STORAGE_SIZE
+        value: $(params.db2_backup_storage_size)
+      - name: DB2_LOGS_STORAGE_SIZE
+        value: $(params.db2_logs_storage_size)
+      - name: DB2_TEMP_STORAGE_SIZE
+        value: $(params.db2_temp_storage_size)
+      # Db2 - Storage - Class
+      - name: DB2_META_STORAGE_CLASS
+        value: $(params.db2_meta_storage_class)
+      - name: DB2_DATA_STORAGE_CLASS
+        value: $(params.db2_data_storage_class)
+      - name: DB2_BACKUP_STORAGE_CLASS
+        value: $(params.db2_backup_storage_class)
+      - name: DB2_LOGS_STORAGE_CLASS
+        value: $(params.db2_logs_storage_class)
+      - name: DB2_TEMP_STORAGE_CLASS
+        value: $(params.db2_temp_storage_class)
+      # Db2 - Storage - Access mode
+      - name: DB2_META_STORAGE_ACCESSMODE
+        value: $(params.db2_meta_storage_accessmode)
+      - name: DB2_DATA_STORAGE_ACCESSMODE
+        value: $(params.db2_data_storage_accessmode)
+      - name: DB2_BACKUP_STORAGE_ACCESSMODE
+        value: $(params.db2_backup_storage_accessmode)
+      - name: DB2_LOGS_STORAGE_ACCESSMODE
+        value: $(params.db2_logs_storage_accessmode)
+      - name: DB2_TEMP_STORAGE_ACCESSMODE
+        value: $(params.db2_temp_storage_accessmode)
+      # Db2 - LDAP
+      - name: DB2_LDAP_USERNAME
+        value: $(params.db2_ldap_username)
+      - name: DB2_LDAP_PASSWORD
+        value: $(params.db2_ldap_password)
+      # MAS - JdbcCfg
+      - name: MAS_CONFIG_DIR
+        value: /workspace/configs
+      - name: MAS_CONFIG_SCOPE
+        value: $(params.mas_config_scope)
+      - name: MAS_INSTANCE_ID
+        value: $(params.mas_instance_id)
+      - name: MAS_APP_ID
+        value: $(params.mas_application_id)
+      - name: MAS_WORKSPACE_ID
+        value: $(params.mas_workspace_id)
+      # Custom labels support
+      - name: CUSTOM_LABELS
+        value: $(params.custom_labels)
+  steps:
+    - name: suite-db2-setup-for-facilities
+      command:
+        - /opt/app-root/src/run-role.sh
+        - suite_db2_setup_for_facilities
+      image: quay.io/ibmmas/cli:13.25.1
+      imagePullPolicy: $(params.image_pull_policy)
+      workingDir: /workspace/configs
+  workspaces:
+    - name: configs
+      optional: true
+# --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/tasks/suite-db2-setup-for-manage.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: mas-devops-suite-db2-setup-for-manage
+spec:
+  params:
+    # Common: Control the image pull policy for the CLI container image
+    - name: image_pull_policy
+      type: string
+      default: IfNotPresent
+    # Common: Support for saving task execution results to a MongoDb instance
+    - name: devops_suite_name
+      type: string
+      description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
+      default: ""
+    - name: db2_instance_name
+      type: string
+      description: Name (specifically, not the ID) of the DB2 Warehouse instance to execute the hack
+    - name: db2_namespace
+      type: string
+      description: Namespace where the DB2 Warehouse instance to execute the hack resides
+      default: "db2u"
+  stepTemplate:
+    env:
+      - name: DEVOPS_MONGO_URI
+        valueFrom:
+          secretKeyRef:
+            name: mas-devops
+            key: DEVOPS_MONGO_URI
+            optional: true
+      - name: DEVOPS_BUILD_NUMBER
+        valueFrom:
+          secretKeyRef:
+            name: mas-devops
+            key: DEVOPS_BUILD_NUMBER
+            optional: true
+      - name: DEVOPS_ENVIRONMENT
+        valueFrom:
+          secretKeyRef:
+            name: mas-devops
+            key: MAS_INSTANCE_ID
+            optional: true
+      - name: DEVOPS_SUITE_NAME
+        value: $(params.devops_suite_name)
+      # General
+      - name: DB2_INSTANCE_NAME
+        value: $(params.db2_instance_name)
+      - name: DB2_NAMESPACE
+        value: $(params.db2_namespace)
+  steps:
+    - name: suite-db2-setup-for-manage
+      command:
+        - /opt/app-root/src/run-role.sh
+        - suite_db2_setup_for_manage
+      image: quay.io/ibmmas/cli:13.25.1
+      imagePullPolicy: $(params.image_pull_policy)
+# --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: mas-devops-suite-dns
+spec:
+  params:
+    # Common: Control the image pull policy for the CLI container image
+    - name: image_pull_policy
+      type: string
+      default: IfNotPresent
+    # Common: Support for saving task execution results to a MongoDb instance
+    - name: devops_suite_name
+      type: string
+      description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
+      default: ""
+    - name: dns_provider
+      type: string
+      default: ""
+    - name: mas_instance_id
+      type: string
+    - name: custom_labels
+      type: string
+      description: Optional MAS custom labels, comma separated list of key=value pairs
+      default: ""
+    - name: mas_domain
+      type: string
+      default: ""
+    - name: mas_workspace_id
+      type: string
+      default: ""
+    # Cloudflare support
+    - name: cloudflare_email
+      type: string
+      default: ""
+    - name: cloudflare_apitoken
+      type: string
+      default: ""
+    - name: cloudflare_zone
+      type: string
+      default: ""
+    - name: cloudflare_subdomain
+      type: string
+      default: ""
+    # IBM Cloud Internet Services support
+    - name: cis_email
+      type: string
+      default: ""
+    - name: cis_apikey
+      type: string
+      default: ""
+    - name: cis_crn
+      type: string
+      default: ""
+    - name: cis_subdomain
+      type: string
+      default: ""
+    # IBM Cloud Internet Services support Security Enhancement support
+    - name: cis_service_name
+      type: string
+      default: ""
+    - name: cis_enhanced_security
+      type: string
+      default: ""
+    - name: override_edge_certs
+      type: string
+      default: "false"
+    - name: cis_proxy
+      type: string
+      default: ""
+    # AWS Route 53 support
+    - name: aws_access_key_id
+      type: string
+      default: ""
+    - name: aws_secret_access_key
+      type: string
+      default: ""
+    - name: route53_hosted_zone_name
+      type: string
+      default: ""
+    - name: route53_hosted_zone_region
+      type: string
+      default: ""
+    - name: route53_email
+      type: string
+      default: ""
+    - name: route53_subdomain
+      type: string
+      default: ""
+    # Use of Manual Certificates
+    - name: mas_manual_cert_mgmt
+      type: string
+      description: Optional boolean parameter that when set to True, indicates that manually created certificates will be used to certify MAS and application routes
+      default: ""
+  stepTemplate:
+    env:
+      - name: DEVOPS_MONGO_URI
+        valueFrom:
+          secretKeyRef:
+            name: mas-devops
+            key: DEVOPS_MONGO_URI
+            optional: true
+      - name: DEVOPS_BUILD_NUMBER
+        valueFrom:
+          secretKeyRef:
+            name: mas-devops
+            key: DEVOPS_BUILD_NUMBER
+            optional: true
+      - name: DEVOPS_ENVIRONMENT
+        valueFrom:
+          secretKeyRef:
+            name: mas-devops
+            key: MAS_INSTANCE_ID
+            optional: true
+      - name: DEVOPS_SUITE_NAME
+        value: $(params.devops_suite_name)
+      # General
+      - name: DNS_PROVIDER
+        value: $(params.dns_provider)
+      - name: MAS_INSTANCE_ID
+        value: $(params.mas_instance_id)
+      - name: MAS_WORKSPACE_ID
+        value: $(params.mas_workspace_id)
+      - name: CUSTOM_LABELS
+        value: $(params.custom_labels)
+      - name: MAS_DOMAIN
+        value: $(params.mas_domain)
+      - name: CLOUDFLARE_EMAIL
+        value: $(params.cloudflare_email)
+      - name: CLOUDFLARE_APITOKEN
+        value: $(params.cloudflare_apitoken)
+      - name: CLOUDFLARE_ZONE
+        value: $(params.cloudflare_zone)
+      - name: CLOUDFLARE_SUBDOMAIN
+        value: $(params.cloudflare_subdomain)
+      - name: CIS_EMAIL
+        value: $(params.cis_email)
+      - name: CIS_APIKEY
+        value: $(params.cis_apikey)
+      - name: CIS_CRN
+        value: $(params.cis_crn)
+      - name: CIS_SUBDOMAIN
+        value: $(params.cis_subdomain)
+      - name: CIS_SERVICE_NAME
         value: $(params.cis_service_name)
       - name: CIS_ENHANCED_SECURITY
         value: $(params.cis_enhanced_security)
@@ -12366,7 +12783,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -12615,7 +13032,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
@@ -12703,7 +13120,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -12768,7 +13185,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -12838,7 +13255,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -12900,12 +13317,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
     # If configmap/approval-suite-verify exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: suite-post-verify
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -13028,7 +13445,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -13109,7 +13526,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -13172,7 +13589,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -13258,7 +13675,7 @@ spec:
       description: "The value to set"
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -13305,7 +13722,7 @@ spec:
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -13386,7 +13803,7 @@ spec:
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -13446,7 +13863,7 @@ spec:
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:13.24.0
+      image: quay.io/ibmmas/cli:13.25.1
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -16140,6 +16557,8 @@ spec:
           operator: notin
           values: [""]
     - name: gitops-db2u-replica-database-manage
+      runAfter:
+        - gitops-db2u-database-manage
       params:
         - name: cluster_name
           value: $(params.cluster_name)
@@ -16494,6 +16913,8 @@ spec:
           operator: notin
           values: [""]
     - name: gitops-db2u-replica-database-facilities
+      runAfter:
+        - gitops-db2u-database-facilities
       params:
         - name: cluster_name
           value: $(params.cluster_name)
@@ -22829,6 +23250,10 @@ spec:
       type: string
       description: Set to 'system' if using the shared system JDBC configuration, or 'workspace-application' if using a dedicated JDBC configuration.
       default: ""
+    - name: db2_action_facilities
+      type: string
+      description: Set to 'install' to set up a Db2 instance for Real Estate and Facilities
+      default: "none"
     # Dependencies - CP4D
     # -----------------------------------------------------------------------------
@@ -23072,6 +23497,12 @@ spec:
       description: Workspace Name used when setting up the workspace
       default: My Workspace
+    # MAS Workspace Configuration - Facilities
+    - name: mas_appws_bindings_jdbc
+      type: string
+      description: JDBC Bindings Workspace
+      default: "workspace-application"
     # MAS Configuration - Application Channels
     # -------------------------------------------------------------------------
     - name: mas_app_channel_iot
@@ -23102,6 +23533,10 @@ spec:
       type: string
       description: Subscription channel for MVI application operator
       default: ""
+    - name: mas_app_channel_facilities
+      type: string
+      description: Subscription channel for Facilities application operator
+      default: ""
     # - name: mas_app_channel_aibroker
     #   type: string
     #   description: Subscription channel for AI Broker application operator
@@ -23504,6 +23939,58 @@ spec:
       default: ""
+    # MAS Application Configuration - Facilities
+    # TODO: Fix type for storage sizes and max conn pool size
+    - name: mas_ws_facilities_size
+      type: string
+      description: Size of the Facilities Deployment
+      default: "small"
+    - name: mas_ws_facilities_routes_timeout
+      type: string
+      description: Optional. Connection timeout of the route.
+      default: ""
+    - name: mas_ws_facilities_liberty_extension_XML
+      type: string
+      description: Optional. Secret name containing XML extension for server.xml
+      default: ""
+    - name: mas_ws_facilities_vault_secret
+      type: string
+      description: Optional. Secret name containing AES encryption secret.
+      default: ""
+    - name: mas_ws_facilities_pull_policy
+      type: string
+      description: Optional. Pull Policy
+      default: ""
+    - name: mas_ws_facilities_storage_log_class
+      type: string
+      description: Define storage class for log
+      default: ""
+    - name: mas_ws_facilities_storage_log_mode
+      type: string
+      description: Define storage mode for log
+      default: ""
+    # - name: mas_ws_facilities_storage_log_size
+    #   description: Define storage size for log
+    #   type: integer
+    - name: mas_ws_facilities_storage_userfiles_class
+      type: string
+      description: Define storage class for userfiles
+      default: ""
+    - name: mas_ws_facilities_storage_userfiles_mode
+      type: string
+      description: Define storage mode for userfiles
+      default: ""
+    # - name: mas_ws_facilities_storage_userfiles_size
+    #   description: Define storage size for userfiles
+    #   type: integer
+    # - name: mas_ws_facilities_dwfagents
+    #   type: array
+    #   description: Define a list of dedicated workflow agents
+    #   default: []
+    # - name: mas_ws_facilities_db_maxconnpoolsize
+    #   description: Define maximum connection pool size
+    #   type: integer
   tasks:
     # Content
     # -------
@@ -23519,6 +24006,8 @@ spec:
     # 10. Install & Configure Optimizer
     # 12. Install & Configure Assist
     # 13. Install & Configure Visual Inspection
+    # 14. Install & Configure AI Broker
+    # 15. Install & Configure Facilities
     - name: pre-install-check
       timeout: "0"
@@ -24934,7 +25423,7 @@ spec:
       # Only load the JDBCCfg if IoT or Manage are being installed
       # See: https://github.com/tektoncd/pipeline/issues/3591#issuecomment-1073901961
       when:
-        - input: "$(params.mas_app_channel_iot)$(params.mas_app_channel_manage)"
+        - input: "$(params.mas_app_channel_iot)$(params.mas_app_channel_manage)$(params.mas_app_channel_facilities)"
           operator: notin
           values: [""]
       workspaces:
@@ -24942,7 +25431,7 @@ spec:
           workspace: shared-configs
       runAfter:
         - suite-verify
-        - db2-manage  # db2-manage already waits for db2-system so we don't need to list both
+        - suite-db2-setup-facilities
     # 5.8 Configure Kafka in MAS
     - name: suite-config-kafka
@@ -25352,21 +25841,178 @@ spec:
           value: $(params.ibm_entitlement_key)
         - name: custom_labels
           value: $(params.custom_labels)
+      taskRef:
+        name: mas-devops-suite-app-install
+        kind: Task
+      # Only install Monitor if a channel has been chosen
+      when:
+        - input: "$(params.mas_app_channel_monitor)"
+          operator: notin
+          values: [""]
+      runAfter:
+        - app-cfg-manage
+        - app-cfg-iot
+    # 8.2 Configure Monitor workspace
+    - name: app-cfg-monitor
+      timeout: "0"
+      params:
+        # Controls the image pull policy for the ibmmas/cli image
+        - name: image_pull_policy
+          value: $(params.image_pull_policy)
+        - name: devops_suite_name
+          value: app-monitor-cfg
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: mas_app_id
+          value: monitor
+        - name: mas_workspace_id
+          value: "$(params.mas_workspace_id)"
+        - name: custom_labels
+          value: $(params.custom_labels)
+      taskRef:
+        name: mas-devops-suite-app-config
+        kind: Task
+      # Only configure a workspace for Monitor if a channel has been chosen
+      when:
+        - input: "$(params.mas_app_channel_monitor)"
+          operator: notin
+          values: [""]
+      workspaces:
+        - name: configs
+          workspace: shared-configs
+      runAfter:
+        - app-install-monitor
+    # 9. Install & Configure Predict
+    # -------------------------------------------------------------------------
+    # 9.1 Predict Install
+    - name: app-install-predict
+      timeout: "0"
+      params:
+        # Controls the image pull policy for the ibmmas/cli image
+        - name: image_pull_policy
+          value: $(params.image_pull_policy)
+        - name: devops_suite_name
+          value: app-predict-install
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: mas_app_id
+          value: predict
+        - name: artifactory_username
+          value: $(params.artifactory_username)
+        - name: artifactory_token
+          value: $(params.artifactory_token)
+        - name: mas_app_channel
+          value: "$(params.mas_app_channel_predict)"
+        - name: ibm_entitlement_key
+          value: $(params.ibm_entitlement_key)
+        - name: custom_labels
+          value: $(params.custom_labels)
+      taskRef:
+        name: mas-devops-suite-app-install
+        kind: Task
+      # Only install Predict if a channel has been chosen
+      when:
+        - input: "$(params.mas_app_channel_predict)"
+          operator: notin
+          values: [""]
+      runAfter:
+        - app-cfg-manage
+        - app-cfg-monitor
+        - suite-config-watson-studio
+        - watson-machine-learning
+        - analytics-service
+        - spss
+    # 9.2 Configure Predict workspace
+    - name: app-cfg-predict
+      timeout: "0"
+      params:
+        # Controls the image pull policy for the ibmmas/cli image
+        - name: image_pull_policy
+          value: $(params.image_pull_policy)
+        - name: devops_suite_name
+          value: app-predict-cfg
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: mas_app_id
+          value: predict
+        - name: mas_workspace_id
+          value: "$(params.mas_workspace_id)"
+        - name: cpd_product_version
+          value: "$(params.cpd_product_version)"
+        - name: predict_deployment_size
+          value: "$(params.predict_deployment_size)"
+        - name: custom_labels
+          value: $(params.custom_labels)
+      taskRef:
+        name: mas-devops-suite-app-config
+        kind: Task
+      # Only install Predict if a channel has been chosen
+      when:
+        - input: "$(params.mas_app_channel_predict)"
+          operator: notin
+          values: [""]
+      workspaces:
+        - name: configs
+          workspace: shared-configs
+      runAfter:
+        - app-install-predict
+    # 10. Install & Configure Optimizer
+    # -------------------------------------------------------------------------
+    # 10.1 Optimizer Install
+    - name: app-install-optimizer
+      timeout: "0"
+      params:
+        # Controls the image pull policy for the ibmmas/cli image
+        - name: image_pull_policy
+          value: $(params.image_pull_policy)
+        - name: devops_suite_name
+          value: app-optimizer-install
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: mas_app_id
+          value: optimizer
+        - name: artifactory_username
+          value: $(params.artifactory_username)
+        - name: artifactory_token
+          value: $(params.artifactory_token)
+        - name: mas_app_channel
+          value: "$(params.mas_app_channel_optimizer)"
+        - name: mas_app_plan
+          value: "$(params.mas_app_plan_optimizer)"
+        - name: ibm_entitlement_key
+          value: $(params.ibm_entitlement_key)
+        - name: custom_labels
+          value: $(params.custom_labels)
       taskRef:
         name: mas-devops-suite-app-install
         kind: Task
-      # Only install Monitor if a channel has been chosen
+      # Only install Optimizer if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_monitor)"
+        - input: "$(params.mas_app_channel_optimizer)"
           operator: notin
           values: [""]
       runAfter:
         - app-cfg-manage
-        - app-cfg-iot
-    # 8.2 Configure Monitor workspace
-    - name: app-cfg-monitor
+    # 10.2 Configure Optimizer workspace
+    - name: app-cfg-optimizer
       timeout: "0"
       params:
         # Controls the image pull policy for the ibmmas/cli image
@@ -25374,35 +26020,35 @@ spec:
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: app-monitor-cfg
+          value: app-optimizer-cfg
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: monitor
+          value: optimizer
         - name: mas_workspace_id
           value: "$(params.mas_workspace_id)"
         - name: custom_labels
           value: $(params.custom_labels)
       taskRef:
         name: mas-devops-suite-app-config
         kind: Task
-      # Only configure a workspace for Monitor if a channel has been chosen
+      # Only install Optimizer if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_monitor)"
+        - input: "$(params.mas_app_channel_optimizer)"
           operator: notin
           values: [""]
       workspaces:
         - name: configs
           workspace: shared-configs
       runAfter:
-        - app-install-monitor
+        - app-install-optimizer
-    # 9. Install & Configure Predict
+    # 11. Install & Configure Assist
     # -------------------------------------------------------------------------
-    # 9.1 Predict Install
-    - name: app-install-predict
+    # 11.1 Assist Install
+    - name: app-install-assist
       timeout: "0"
       params:
         # Controls the image pull policy for the ibmmas/cli image
@@ -25410,18 +26056,19 @@ spec:
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: app-predict-install
+          value: app-assist-install
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: predict
+          value: assist
         - name: artifactory_username
           value: $(params.artifactory_username)
         - name: artifactory_token
           value: $(params.artifactory_token)
         - name: mas_app_channel
-          value: "$(params.mas_app_channel_predict)"
+          value: "$(params.mas_app_channel_assist)"
         - name: ibm_entitlement_key
           value: $(params.ibm_entitlement_key)
         - name: custom_labels
@@ -25429,21 +26076,16 @@ spec:
       taskRef:
         name: mas-devops-suite-app-install
         kind: Task
-      # Only install Predict if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_predict)"
+        - input: "$(params.mas_app_channel_assist)"
           operator: notin
           values: [""]
       runAfter:
         - app-cfg-manage
-        - app-cfg-monitor
-        - suite-config-watson-studio
-        - watson-machine-learning
-        - analytics-service
-        - spss
+        - suite-config-cos
-    # 9.2 Configure Predict workspace
-    - name: app-cfg-predict
+    # 11.2 Configure Assist workspace
+    - name: app-cfg-assist
       timeout: "0"
       params:
         # Controls the image pull policy for the ibmmas/cli image
@@ -25451,41 +26093,35 @@ spec:
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: app-predict-cfg
+          value: app-assist-cfg
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: predict
+          value: assist
         - name: mas_workspace_id
           value: "$(params.mas_workspace_id)"
-        - name: cpd_product_version
-          value: "$(params.cpd_product_version)"
-        - name: predict_deployment_size
-          value: "$(params.predict_deployment_size)"
         - name: custom_labels
           value: $(params.custom_labels)
       taskRef:
         name: mas-devops-suite-app-config
         kind: Task
-      # Only install Predict if a channel has been chosen
+      # Only install Assist if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_predict)"
+        - input: "$(params.mas_app_channel_assist)"
           operator: notin
           values: [""]
       workspaces:
         - name: configs
           workspace: shared-configs
       runAfter:
-        - app-install-predict
+        - app-install-assist
-    # 10. Install & Configure Optimizer
+    # 12. Install & Configure Visual Inspection
     # -------------------------------------------------------------------------
-    # 10.1 Optimizer Install
-    - name: app-install-optimizer
+    # 12.1 MVI Install
+    - name: app-install-visualinspection
       timeout: "0"
       params:
         # Controls the image pull policy for the ibmmas/cli image
@@ -25493,20 +26129,20 @@ spec:
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: app-optimizer-install
+          value: app-visualinspection-install
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: optimizer
+          value: visualinspection
         - name: artifactory_username
           value: $(params.artifactory_username)
         - name: artifactory_token
           value: $(params.artifactory_token)
         - name: mas_app_channel
-          value: "$(params.mas_app_channel_optimizer)"
-        - name: mas_app_plan
-          value: "$(params.mas_app_plan_optimizer)"
+          value: "$(params.mas_app_channel_visualinspection)"
+        - name: mas_app_settings_visualinspection_storage_class
+          value: $(params.storage_class_rwx) # use common rwx storage class as user is not prompted to choose this storage class
         - name: ibm_entitlement_key
           value: $(params.ibm_entitlement_key)
         - name: custom_labels
@@ -25514,16 +26150,18 @@ spec:
       taskRef:
         name: mas-devops-suite-app-install
         kind: Task
-      # Only install Optimizer if a channel has been chosen
+      # Only install MVI if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_optimizer)"
+        - input: "$(params.mas_app_channel_visualinspection)"
           operator: notin
           values: [""]
       runAfter:
         - app-cfg-manage
+        - nvidia-gpu
+        - suite-verify
-    # 10.2 Configure Optimizer workspace
-    - name: app-cfg-optimizer
+    # 12.2 Configure MVI workspace
+    - name: app-cfg-visualinspection
       timeout: "0"
       params:
         # Controls the image pull policy for the ibmmas/cli image
@@ -25531,108 +26169,217 @@ spec:
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: app-optimizer-cfg
+          value: app-visualinspection-cfg
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: optimizer
+          value: visualinspection
         - name: mas_workspace_id
           value: "$(params.mas_workspace_id)"
         - name: custom_labels
           value: $(params.custom_labels)
       taskRef:
         name: mas-devops-suite-app-config
         kind: Task
-      # Only install Optimizer if a channel has been chosen
+      # Only install MVI if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_optimizer)"
+        - input: "$(params.mas_app_channel_visualinspection)"
           operator: notin
           values: [""]
       workspaces:
         - name: configs
           workspace: shared-configs
       runAfter:
-        - app-install-optimizer
+        - app-install-visualinspection
-    # 11. Install & Configure Assist
+    # 13. Verify health of the cluster before we consider the install complete
     # -------------------------------------------------------------------------
-    # 11.1 Assist Install
-    - name: app-install-assist
+    - name: post-install-verify
       timeout: "0"
+      taskRef:
+        kind: Task
+        name: mas-devops-ocp-verify
       params:
         # Controls the image pull policy for the ibmmas/cli image
         - name: image_pull_policy
           value: $(params.image_pull_policy)
+        # Pipeline Config
+        - name: skip_pre_check
+          value: $(params.skip_pre_check)
         - name: devops_suite_name
-          value: app-assist-install
+          value: post-install-verify
+        - name: verify_cluster
+          value: True
+        - name: verify_catalogsources
+          value: True
+        - name: verify_subscriptions
+          value: True
+        - name: verify_workloads
+          value: True
+        - name: verify_ingress
+          value: True
+        - name: ocp_ingress_tls_secret_name
+          value: $(params.ocp_ingress_tls_secret_name)
+      when:
+        - input: "$(params.skip_pre_check)"
+          operator: notin
+          values: ["True", "true"]
+      runAfter:
+        - app-cfg-assist
+        - app-cfg-optimizer
+        - app-cfg-predict # infers Manage completed
+        - app-cfg-monitor # infers IoT completed
+        - app-cfg-visualinspection
+        - arcgis
+        - eck
+        - turbonomic
+        - cognos
+    # 14 Install and configure AI Broker
+    # -------------------------------------------------------------------------
+    # 14.1 Install Opendatahub
+    - name: odh
+      params:
+        # Controls the image pull policy for the ibmmas/cli image
+        - name: image_pull_policy
+          value: $(params.image_pull_policy)
+        - name: devops_suite_name
+          value: odh
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: assist
+          value: aibroker
         - name: artifactory_username
           value: $(params.artifactory_username)
         - name: artifactory_token
           value: $(params.artifactory_token)
         - name: mas_app_channel
-          value: "$(params.mas_app_channel_assist)"
+          value: "$(params.mas_app_channel_aibroker)"
         - name: ibm_entitlement_key
           value: $(params.ibm_entitlement_key)
         - name: custom_labels
           value: $(params.custom_labels)
+        - name: mas_aibroker_storage_provider
+          value: $(params.mas_aibroker_storage_provider)
+        - name: mas_aibroker_storage_accesskey
+          value: $(params.mas_aibroker_storage_accesskey)
+        - name: mas_aibroker_storage_secretkey
+          value: $(params.mas_aibroker_storage_secretkey)
+        - name: mas_aibroker_storage_host
+          value: $(params.mas_aibroker_storage_host)
+        - name: mas_aibroker_storage_port
+          value: $(params.mas_aibroker_storage_port)
+        - name: mas_aibroker_storage_ssl
+          value: $(params.mas_aibroker_storage_ssl)
+        - name: mas_aibroker_storage_region
+          value: $(params.mas_aibroker_storage_region)
+        - name: mas_aibroker_storage_pipelines_bucket
+          value: $(params.mas_aibroker_storage_pipelines_bucket)
+        - name: mas_aibroker_storage_tenants_bucket
+          value: $(params.mas_aibroker_storage_tenants_bucket)
+        - name: mas_aibroker_storage_templates_bucket
+          value: $(params.mas_aibroker_storage_templates_bucket)
+        - name: mas_aibroker_tenant_name
+          value: $(params.mas_aibroker_tenant_name)
+        - name: mas_aibroker_db_host
+          value: $(params.mas_aibroker_db_host)
+        - name: mas_aibroker_db_port
+          value: $(params.mas_aibroker_db_port)
+        - name: mas_aibroker_db_user
+          value: $(params.mas_aibroker_db_user)
+        - name: mas_aibroker_db_database
+          value: $(params.mas_aibroker_db_database)
+        - name: mas_aibroker_db_secret_name
+          value: $(params.mas_aibroker_db_secret_name)
+        - name: mas_aibroker_db_secret_key
+          value: $(params.mas_aibroker_db_secret_key)
+        - name: mas_aibroker_db_secret_value
+          value: $(params.mas_aibroker_db_secret_value)
       taskRef:
-        name: mas-devops-suite-app-install
+        name: mas-devops-odh
         kind: Task
       when:
-        - input: "$(params.mas_app_channel_assist)"
+        - input: "$(params.mas_app_channel_aibroker)"
           operator: notin
           values: [""]
       runAfter:
-        - app-cfg-manage
-        - suite-config-cos
+        - suite-verify
-    # 11.2 Configure Assist workspace
-    - name: app-cfg-assist
-      timeout: "0"
+    # 14.2 Install Kmodels
+    - name: kmodels
       params:
         # Controls the image pull policy for the ibmmas/cli image
         - name: image_pull_policy
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: app-assist-cfg
+          value: kmodels
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: assist
-        - name: mas_workspace_id
-          value: "$(params.mas_workspace_id)"
+          value: aibroker
+        - name: artifactory_username
+          value: $(params.artifactory_username)
+        - name: artifactory_token
+          value: $(params.artifactory_token)
+        - name: mas_app_channel
+          value: "$(params.mas_app_channel_aibroker)"
+        - name: ibm_entitlement_key
+          value: $(params.ibm_entitlement_key)
         - name: custom_labels
           value: $(params.custom_labels)
+        - name: mas_aibroker_storage_provider
+          value: $(params.mas_aibroker_storage_provider)
+        - name: mas_aibroker_storage_accesskey
+          value: $(params.mas_aibroker_storage_accesskey)
+        - name: mas_aibroker_storage_secretkey
+          value: $(params.mas_aibroker_storage_secretkey)
+        - name: mas_aibroker_storage_host
+          value: $(params.mas_aibroker_storage_host)
+        - name: mas_aibroker_storage_port
+          value: $(params.mas_aibroker_storage_port)
+        - name: mas_aibroker_storage_ssl
+          value: $(params.mas_aibroker_storage_ssl)
+        - name: mas_aibroker_storage_region
+          value: $(params.mas_aibroker_storage_region)
+        - name: mas_aibroker_storage_pipelines_bucket
+          value: $(params.mas_aibroker_storage_pipelines_bucket)
+        - name: mas_aibroker_storage_tenants_bucket
+          value: $(params.mas_aibroker_storage_tenants_bucket)
+        - name: mas_aibroker_storage_templates_bucket
+          value: $(params.mas_aibroker_storage_templates_bucket)
+        - name: mas_aibroker_controller_tag
+          value: $(params.mas_aibroker_controller_tag)
+        - name: mas_aibroker_store_tag
+          value: $(params.mas_aibroker_store_tag)
+        - name: mas_aibroker_watcher_tag
+          value: $(params.mas_aibroker_watcher_tag)
+        - name: mas_aibroker_connector_tag
+          value: $(params.mas_aibroker_connector_tag)
+        - name: mas_aibroker_pipeline_steps_tag
+          value: $(params.mas_aibroker_pipeline_steps_tag)
+        - name: mas_aibroker_tenant_name
+          value: $(params.mas_aibroker_tenant_name)
       taskRef:
-        name: mas-devops-suite-app-config
+        name: mas-devops-kmodels
         kind: Task
-      # Only install Assist if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_assist)"
+        - input: "$(params.mas_app_channel_aibroker)"
           operator: notin
           values: [""]
-      workspaces:
-        - name: configs
-          workspace: shared-configs
       runAfter:
-        - app-install-assist
+        - odh
-    # 12. Install & Configure Visual Inspection
-    # -------------------------------------------------------------------------
-    # 12.1 MVI Install
-    - name: app-install-visualinspection
+    # 14.3 Install Aibroker app
+    - name: app-install-aibroker
       timeout: "0"
       params:
         # Controls the image pull policy for the ibmmas/cli image
@@ -25640,20 +26387,18 @@ spec:
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: app-visualinspection-install
+          value: app-aibroker-install
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: visualinspection
+          value: aibroker
         - name: artifactory_username
           value: $(params.artifactory_username)
         - name: artifactory_token
           value: $(params.artifactory_token)
         - name: mas_app_channel
-          value: "$(params.mas_app_channel_visualinspection)"
-        - name: mas_app_settings_visualinspection_storage_class
-          value: $(params.storage_class_rwx) # use common rwx storage class as user is not prompted to choose this storage class
+          value: "$(params.mas_app_channel_aibroker)"
         - name: ibm_entitlement_key
           value: $(params.ibm_entitlement_key)
         - name: custom_labels
@@ -25661,18 +26406,16 @@ spec:
       taskRef:
         name: mas-devops-suite-app-install
         kind: Task
-      # Only install MVI if a channel has been chosen
+      # Only install aibroker if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_visualinspection)"
+        - input: "$(params.mas_app_channel_aibroker)"
           operator: notin
           values: [""]
       runAfter:
-        - app-cfg-manage
-        - nvidia-gpu
-        - suite-verify
+        - kmodels
-    # 12.2 Configure MVI workspace
-    - name: app-cfg-visualinspection
+    # 14.4 Configure Aibroker
+    - name: aibroker
       timeout: "0"
       params:
         # Controls the image pull policy for the ibmmas/cli image
@@ -25680,217 +26423,247 @@ spec:
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: app-visualinspection-cfg
+          value: aibroker
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: visualinspection
-        - name: mas_workspace_id
-          value: "$(params.mas_workspace_id)"
+          value: aibroker
+        - name: artifactory_username
+          value: $(params.artifactory_username)
+        - name: artifactory_token
+          value: $(params.artifactory_token)
+        - name: mas_app_channel
+          value: "$(params.mas_app_channel_aibroker)"
+        - name: ibm_entitlement_key
+          value: $(params.ibm_entitlement_key)
         - name: custom_labels
           value: $(params.custom_labels)
+        - name: mas_aibroker_storage_provider
+          value: $(params.mas_aibroker_storage_provider)
+        - name: mas_aibroker_storage_accesskey
+          value: $(params.mas_aibroker_storage_accesskey)
+        - name: mas_aibroker_storage_secretkey
+          value: $(params.mas_aibroker_storage_secretkey)
+        - name: mas_aibroker_storage_host
+          value: $(params.mas_aibroker_storage_host)
+        - name: mas_aibroker_storage_port
+          value: $(params.mas_aibroker_storage_port)
+        - name: mas_aibroker_storage_ssl
+          value: $(params.mas_aibroker_storage_ssl)
+        - name: mas_aibroker_storage_region
+          value: $(params.mas_aibroker_storage_region)
+        - name: mas_aibroker_storage_pipelines_bucket
+          value: $(params.mas_aibroker_storage_pipelines_bucket)
+        - name: mas_aibroker_storage_tenants_bucket
+          value: $(params.mas_aibroker_storage_tenants_bucket)
+        - name: mas_aibroker_storage_templates_bucket
+          value: $(params.mas_aibroker_storage_templates_bucket)
+        - name: mas_aibroker_watsonxai_apikey
+          value: $(params.mas_aibroker_watsonxai_apikey)
+        - name: mas_aibroker_watsonxai_url
+          value: $(params.mas_aibroker_watsonxai_url)
+        - name: mas_aibroker_watsonxai_project_id
+          value: $(params.mas_aibroker_watsonxai_project_id)
+        - name: mas_aibroker_watsonx_action
+          value: $(params.mas_aibroker_watsonx_action)
+        - name: mas_aibroker_s3_action
+          value: $(params.mas_aibroker_s3_action)
+        - name: mas_aibroker_apikey_action
+          value: $(params.mas_aibroker_apikey_action)
+        - name: mas_aibroker_tenant_name
+          value: $(params.mas_aibroker_tenant_name)
       taskRef:
-        name: mas-devops-suite-app-config
+        name: mas-devops-aibroker
         kind: Task
-      # Only install MVI if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_visualinspection)"
+        - input: "$(params.mas_app_channel_aibroker)"
           operator: notin
           values: [""]
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      runAfter:
-        - app-install-visualinspection
-    # 13. Verify health of the cluster before we consider the install complete
-    # -------------------------------------------------------------------------
-    - name: post-install-verify
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-devops-ocp-verify
-      params:
-        # Controls the image pull policy for the ibmmas/cli image
-        - name: image_pull_policy
-          value: $(params.image_pull_policy)
-        # Pipeline Config
-        - name: skip_pre_check
-          value: $(params.skip_pre_check)
-        - name: devops_suite_name
-          value: post-install-verify
-        - name: verify_cluster
-          value: True
-        - name: verify_catalogsources
-          value: True
-        - name: verify_subscriptions
-          value: True
-        - name: verify_workloads
-          value: True
-        - name: verify_ingress
-          value: True
-        - name: ocp_ingress_tls_secret_name
-          value: $(params.ocp_ingress_tls_secret_name)
-      when:
-        - input: "$(params.skip_pre_check)"
-          operator: notin
-          values: ["True", "true"]
       runAfter:
-        - app-cfg-assist
-        - app-cfg-optimizer
-        - app-cfg-predict # infers Manage completed
-        - app-cfg-monitor # infers IoT completed
-        - app-cfg-visualinspection
-        - arcgis
-        - eck
-        - turbonomic
-        - cognos
+        - app-install-aibroker
+    # 15 Install and configure Facilities
+    # -------------------------------------------------------------------------
-    # 14 Install and configure AI Broker
-    # -------------------------------------------------------------------------
-    # 14.1 Install Opendatahub
-    - name: odh
+    # 15.1 Dedicated Facilities Db2
+    - name: suite-db2-setup-facilities
+      timeout: "0"
       params:
         # Controls the image pull policy for the ibmmas/cli image
         - name: image_pull_policy
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: odh
+          value: suite-db2-setup-facilities
         - name: mas_instance_id
           value: $(params.mas_instance_id)
-        - name: mas_app_id
-          value: aibroker
-        - name: artifactory_username
-          value: $(params.artifactory_username)
-        - name: artifactory_token
-          value: $(params.artifactory_token)
-        - name: mas_app_channel
-          value: "$(params.mas_app_channel_aibroker)"
+        - name: db2_instance_name
+          value: "mas-$(params.mas_instance_id)-$(params.mas_workspace_id)-facilities"
+        # Entitlement
         - name: ibm_entitlement_key
           value: $(params.ibm_entitlement_key)
+        # Operator Subscription
+        - name: db2_channel
+          value: $(params.db2_channel)
+        # DB2 instance
+        - name: db2_ldap_username
+          value: $(params.db2_ldap_username)
+        - name: db2_ldap_password
+          value: $(params.db2_ldap_password)
+        - name: db2_type
+          value: $(params.db2_type)
+        - name: db2_timezone
+          value: $(params.db2_timezone)
+        - name: db2_namespace
+          value: $(params.db2_namespace)
+        - name: db2_dbname
+          value: $(params.db2_dbname)
+        - name: db2_version
+          value: $(params.db2_version)
+        - name: db2_workload
+          value: $(params.db2_workload)
+        - name: db2_4k_device_support
+          value: $(params.db2_4k_device_support)
+        - name: db2_table_org
+          value: $(params.db2_table_org)
+        # Node Scheduling
+        - name: db2_affinity_key
+          value: $(params.db2_affinity_key)
+        - name: db2_affinity_value
+          value: $(params.db2_affinity_value)
+        - name: db2_tolerate_key
+          value: $(params.db2_tolerate_key)
+        - name: db2_tolerate_value
+          value: $(params.db2_tolerate_value)
+        - name: db2_tolerate_effect
+          value: $(params.db2_tolerate_effect)
+        # Requests and Limits - CPU
+        - name: db2_cpu_requests
+          value: $(params.db2_cpu_requests)
+        - name: db2_cpu_limits
+          value: $(params.db2_cpu_limits)
+        # Requests and Limits - Memory
+        - name: db2_memory_requests
+          value: $(params.db2_memory_requests)
+        - name: db2_memory_limits
+          value: $(params.db2_memory_limits)
+        # Storage - Capacity
+        - name: db2_meta_storage_size
+          value: $(params.db2_meta_storage_size)
+        - name: db2_backup_storage_size
+          value: $(params.db2_backup_storage_size)
+        - name: db2_logs_storage_size
+          value: $(params.db2_logs_storage_size)
+        - name: db2_temp_storage_size
+          value: $(params.db2_temp_storage_size)
+        - name: db2_data_storage_size
+          value: $(params.db2_data_storage_size)
+        # Storage - Class
+        - name: db2_meta_storage_class
+          value: $(params.storage_class_rwx)
+        - name: db2_data_storage_class
+          value: $(params.storage_class_rwo)
+        - name: db2_backup_storage_class
+          value: $(params.storage_class_rwx)
+        - name: db2_logs_storage_class
+          value: $(params.storage_class_rwo)
+        - name: db2_temp_storage_class
+          value: $(params.storage_class_rwo)
+        # Storage - Access mode
+        - name: db2_meta_storage_accessmode
+          value: $(params.db2_meta_storage_accessmode)
+        - name: db2_backup_storage_accessmode
+          value: $(params.db2_backup_storage_accessmode)
+        - name: db2_temp_storage_accessmode
+          value: $(params.db2_temp_storage_accessmode)
+        - name: db2_logs_storage_accessmode
+          value: $(params.db2_logs_storage_accessmode)
+        - name: db2_data_storage_accessmode
+          value: $(params.db2_data_storage_accessmode)
+        - name: mas_config_scope
+          value: wsapp
+        - name: mas_workspace_id
+          value: $(params.mas_workspace_id)
+        - name: mas_application_id
+          value: facilities
+        - name: db2_action_facilities
+          value: $(params.db2_action_facilities)
+        # Custom label support
         - name: custom_labels
           value: $(params.custom_labels)
-        - name: mas_aibroker_storage_provider
-          value: $(params.mas_aibroker_storage_provider)
-        - name: mas_aibroker_storage_accesskey
-          value: $(params.mas_aibroker_storage_accesskey)
-        - name: mas_aibroker_storage_secretkey
-          value: $(params.mas_aibroker_storage_secretkey)
-        - name: mas_aibroker_storage_host
-          value: $(params.mas_aibroker_storage_host)
-        - name: mas_aibroker_storage_port
-          value: $(params.mas_aibroker_storage_port)
-        - name: mas_aibroker_storage_ssl
-          value: $(params.mas_aibroker_storage_ssl)
-        - name: mas_aibroker_storage_region
-          value: $(params.mas_aibroker_storage_region)
-        - name: mas_aibroker_storage_pipelines_bucket
-          value: $(params.mas_aibroker_storage_pipelines_bucket)
-        - name: mas_aibroker_storage_tenants_bucket
-          value: $(params.mas_aibroker_storage_tenants_bucket)
-        - name: mas_aibroker_storage_templates_bucket
-          value: $(params.mas_aibroker_storage_templates_bucket)
-        - name: mas_aibroker_tenant_name
-          value: $(params.mas_aibroker_tenant_name)
-        - name: mas_aibroker_db_host
-          value: $(params.mas_aibroker_db_host)
-        - name: mas_aibroker_db_port
-          value: $(params.mas_aibroker_db_port)
-        - name: mas_aibroker_db_user
-          value: $(params.mas_aibroker_db_user)
-        - name: mas_aibroker_db_database
-          value: $(params.mas_aibroker_db_database)
-        - name: mas_aibroker_db_secret_name
-          value: $(params.mas_aibroker_db_secret_name)
-        - name: mas_aibroker_db_secret_key
-          value: $(params.mas_aibroker_db_secret_key)
-        - name: mas_aibroker_db_secret_value
-          value: $(params.mas_aibroker_db_secret_value)
-      taskRef:
-        name: mas-devops-odh
-        kind: Task
+      # Only perform the task when a dedicated database is selected
       when:
-        - input: "$(params.mas_app_channel_aibroker)"
+        - input: "$(params.mas_app_channel_facilities)"
           operator: notin
           values: [""]
+        - input: "$(params.db2_action_facilities)"
+          operator: in
+          values: ["install"]
+      taskRef:
+        name: mas-devops-suite-db2-setup-for-facilities
+        kind: Task
+      workspaces:
+        - name: configs
+          workspace: shared-configs
       runAfter:
-        - suite-verify
+        - db2-manage
-    # 14.2 Install Kmodels
-    - name: kmodels
+    # 15.2 Install Facilities
+    - name: app-install-facilities
+      timeout: "0"
       params:
         # Controls the image pull policy for the ibmmas/cli image
         - name: image_pull_policy
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: kmodels
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_app_id
-          value: aibroker
+          value: app-facilities-install
         - name: artifactory_username
           value: $(params.artifactory_username)
         - name: artifactory_token
           value: $(params.artifactory_token)
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: mas_app_id
+          value: facilities
         - name: mas_app_channel
-          value: "$(params.mas_app_channel_aibroker)"
+          value: "$(params.mas_app_channel_facilities)"
         - name: ibm_entitlement_key
           value: $(params.ibm_entitlement_key)
         - name: custom_labels
           value: $(params.custom_labels)
-        - name: mas_aibroker_storage_provider
-          value: $(params.mas_aibroker_storage_provider)
-        - name: mas_aibroker_storage_accesskey
-          value: $(params.mas_aibroker_storage_accesskey)
-        - name: mas_aibroker_storage_secretkey
-          value: $(params.mas_aibroker_storage_secretkey)
-        - name: mas_aibroker_storage_host
-          value: $(params.mas_aibroker_storage_host)
-        - name: mas_aibroker_storage_port
-          value: $(params.mas_aibroker_storage_port)
-        - name: mas_aibroker_storage_ssl
-          value: $(params.mas_aibroker_storage_ssl)
-        - name: mas_aibroker_storage_region
-          value: $(params.mas_aibroker_storage_region)
-        - name: mas_aibroker_storage_pipelines_bucket
-          value: $(params.mas_aibroker_storage_pipelines_bucket)
-        - name: mas_aibroker_storage_tenants_bucket
-          value: $(params.mas_aibroker_storage_tenants_bucket)
-        - name: mas_aibroker_storage_templates_bucket
-          value: $(params.mas_aibroker_storage_templates_bucket)
-        - name: mas_aibroker_controller_tag
-          value: $(params.mas_aibroker_controller_tag)
-        - name: mas_aibroker_store_tag
-          value: $(params.mas_aibroker_store_tag)
-        - name: mas_aibroker_watcher_tag
-          value: $(params.mas_aibroker_watcher_tag)
-        - name: mas_aibroker_connector_tag
-          value: $(params.mas_aibroker_connector_tag)
-        - name: mas_aibroker_pipeline_steps_tag
-          value: $(params.mas_aibroker_pipeline_steps_tag)
-        - name: mas_aibroker_tenant_name
-          value: $(params.mas_aibroker_tenant_name)
       taskRef:
-        name: mas-devops-kmodels
+        name: mas-devops-suite-app-install
         kind: Task
+      workspaces:
+        - name: pod-templates
+          workspace: shared-pod-templates
+      # Only install facilities if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_aibroker)"
+        - input: "$(params.mas_app_channel_facilities)"
           operator: notin
           values: [""]
       runAfter:
-        - odh
+        - suite-config-db2
-    # 14.3 Install Aibroker app
-    - name: app-install-aibroker
+    # 15.3 Configure Facilities workspace
+    - name: app-cfg-facilities
       timeout: "0"
       params:
         # Controls the image pull policy for the ibmmas/cli image
@@ -25898,101 +26671,102 @@ spec:
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: app-aibroker-install
+          value: app-facilities-cfg
+        # Application Workspace - Identifier
         - name: mas_instance_id
           value: $(params.mas_instance_id)
         - name: mas_app_id
-          value: aibroker
-        - name: artifactory_username
-          value: $(params.artifactory_username)
-        - name: artifactory_token
-          value: $(params.artifactory_token)
-        - name: mas_app_channel
-          value: "$(params.mas_app_channel_aibroker)"
-        - name: ibm_entitlement_key
-          value: $(params.ibm_entitlement_key)
+          value: facilities
+        - name: mas_workspace_id
+          value: "$(params.mas_workspace_id)"
+        # Application Workspace - Operand
+        - name: mas_appws_bindings_jdbc
+          value: $(params.mas_appws_bindings_jdbc)
+        - name: mas_ws_facilities_size
+          value: $(params.mas_ws_facilities_size)
+        - name: mas_ws_facilities_routes_timeout
+          value: $(params.mas_ws_facilities_routes_timeout)
+        - name: mas_ws_facilities_liberty_extension_XML
+          value: $(params.mas_ws_facilities_liberty_extension_XML)
+        - name: mas_ws_facilities_vault_secret
+          value: $(params.mas_ws_facilities_vault_secret)
+        - name: mas_ws_facilities_pull_policy
+          value: $(params.mas_ws_facilities_pull_policy)
+        - name: mas_ws_facilities_storage_log_class
+          value: $(params.mas_ws_facilities_storage_log_class)
+        - name: mas_ws_facilities_storage_log_mode
+          value: $(params.mas_ws_facilities_storage_log_mode)
+        # - name: mas_ws_facilities_storage_log_size
+        #   value: $(params.mas_ws_facilities_storage_log_size)
+        - name: mas_ws_facilities_storage_userfiles_class
+          value: $(params.mas_ws_facilities_storage_userfiles_class)
+        - name: mas_ws_facilities_storage_userfiles_mode
+          value: $(params.mas_ws_facilities_storage_userfiles_mode)
+        # - name: mas_ws_facilities_storage_userfiles_size
+        #   value: $(params.mas_ws_facilities_storage_userfiles_size)
+        # - name: mas_ws_facilities_dwfagents
+        #   value: "$(params.mas_ws_facilities_dwfagents)"
+        # - name: mas_ws_facilities_db_maxconnpoolsize
+        #   value: $(params.mas_ws_facilities_db_maxconnpoolsize)
+        # Custom Label Support
         - name: custom_labels
           value: $(params.custom_labels)
       taskRef:
-        name: mas-devops-suite-app-install
+        name: mas-devops-suite-app-config
         kind: Task
-      # Only install aibroker if a channel has been chosen
+      # Only install facilities if a channel has been chosen
       when:
-        - input: "$(params.mas_app_channel_aibroker)"
+        - input: "$(params.mas_app_channel_facilities)"
           operator: notin
           values: [""]
+      workspaces:
+        - name: configs
+          workspace: shared-configs
+        - name: pod-templates
+          workspace: shared-pod-templates
       runAfter:
-        - kmodels
-    # 14.4 Configure Aibroker
-    - name: aibroker
+        - app-install-facilities
+    # 15.4 Verify Facilities Installation
+    - name: app-verify-facilities
       timeout: "0"
+      taskRef:
+        name: mas-devops-suite-app-verify
+        kind: Task
       params:
         # Controls the image pull policy for the ibmmas/cli image
         - name: image_pull_policy
           value: $(params.image_pull_policy)
         - name: devops_suite_name
-          value: aibroker
+          value: app-verify-facilities
+        # MAS Details
         - name: mas_instance_id
           value: $(params.mas_instance_id)
-        - name: mas_app_id
-          value: aibroker
-        - name: artifactory_username
-          value: $(params.artifactory_username)
-        - name: artifactory_token
-          value: $(params.artifactory_token)
-        - name: mas_app_channel
-          value: "$(params.mas_app_channel_aibroker)"
-        - name: ibm_entitlement_key
-          value: $(params.ibm_entitlement_key)
+        - name: mas_workspace_id
+          value: "$(params.mas_workspace_id)"
+        # Application CR Details
+        - name: mas_app_ws_apiversion
+          value: apps.mas.ibm.com/v1
+        - name: mas_app_ws_kind
+          value: FacilitiesWorkspace
+        - name: mas_app_namespace
+          value: mas-$(params.mas_instance_id)-facilities
+        # Custom Label Support
         - name: custom_labels
           value: $(params.custom_labels)
-        - name: mas_aibroker_storage_provider
-          value: $(params.mas_aibroker_storage_provider)
-        - name: mas_aibroker_storage_accesskey
-          value: $(params.mas_aibroker_storage_accesskey)
-        - name: mas_aibroker_storage_secretkey
-          value: $(params.mas_aibroker_storage_secretkey)
-        - name: mas_aibroker_storage_host
-          value: $(params.mas_aibroker_storage_host)
-        - name: mas_aibroker_storage_port
-          value: $(params.mas_aibroker_storage_port)
-        - name: mas_aibroker_storage_ssl
-          value: $(params.mas_aibroker_storage_ssl)
-        - name: mas_aibroker_storage_region
-          value: $(params.mas_aibroker_storage_region)
-        - name: mas_aibroker_storage_pipelines_bucket
-          value: $(params.mas_aibroker_storage_pipelines_bucket)
-        - name: mas_aibroker_storage_tenants_bucket
-          value: $(params.mas_aibroker_storage_tenants_bucket)
-        - name: mas_aibroker_storage_templates_bucket
-          value: $(params.mas_aibroker_storage_templates_bucket)
-        - name: mas_aibroker_watsonxai_apikey
-          value: $(params.mas_aibroker_watsonxai_apikey)
-        - name: mas_aibroker_watsonxai_url
-          value: $(params.mas_aibroker_watsonxai_url)
-        - name: mas_aibroker_watsonxai_project_id
-          value: $(params.mas_aibroker_watsonxai_project_id)
-        - name: mas_aibroker_watsonx_action
-          value: $(params.mas_aibroker_watsonx_action)
-        - name: mas_aibroker_s3_action
-          value: $(params.mas_aibroker_s3_action)
-        - name: mas_aibroker_apikey_action
-          value: $(params.mas_aibroker_apikey_action)
-        - name: mas_aibroker_tenant_name
-          value: $(params.mas_aibroker_tenant_name)
-      taskRef:
-        name: mas-devops-aibroker
-        kind: Task
       when:
-        - input: "$(params.mas_app_channel_aibroker)"
+        - input: "$(params.mas_app_channel_facilities)"
           operator: notin
           values: [""]
       runAfter:
-        - app-install-aibroker
+        - app-cfg-facilities
   finally:
     # Update synchronization configmap
@@ -26779,6 +27553,22 @@ spec:
           value: iot
         - name: devops_suite_name
           value: app-iot-uninstall
+    # 1.8 Uninstall Facilities
+    - name: app-uninstall-facilities
+      timeout: "0"
+      runAfter:
+        - waitfor-approval
+      taskRef:
+        kind: Task
+        name: mas-devops-suite-app-uninstall
+      params:
+        - name: mas_instance_id
+          value: $(params.mas_instance_id)
+        - name: mas_app_id
+          value: facilities
+        - name: devops_suite_name
+          value: app-facilities-uninstall
     # 2. Uninstall IBM Maximo Application Suite
@@ -26791,6 +27581,7 @@ spec:
         - app-uninstall-assist
         - app-uninstall-optimizer
         - app-uninstall-manage
+        - app-uninstall-facilities
       taskRef:
         kind: Task
         name: mas-devops-suite-uninstall
@@ -28148,6 +28939,10 @@ spec:
       type: string
       description: Set to 'system' if using the shared system JDBC configuration, or 'workspace-application' if using a dedicated JDBC configuration.
       default: ""
+    - name: db2_action_facilities
+      type: string
+      description: Set to 'install' to set up a Db2 instance for Real Estate and Facilities
+      default: "none"
     # Dependencies - CP4D
     # -----------------------------------------------------------------------------
@@ -28391,6 +29186,12 @@ spec:
       description: Workspace Name used when setting up the workspace
       default: My Workspace
+    # MAS Workspace Configuration - Facilities
+    - name: mas_appws_bindings_jdbc
+      type: string
+      description: JDBC Bindings Workspace
+      default: "workspace-application"
     # MAS Configuration - Application Channels
     # -------------------------------------------------------------------------
     - name: mas_app_channel_iot
@@ -28421,6 +29222,10 @@ spec:
       type: string
       description: Subscription channel for MVI application operator
       default: ""
+    - name: mas_app_channel_facilities
+      type: string
+      description: Subscription channel for Facilities application operator
+      default: ""
     # - name: mas_app_channel_aibroker
     #   type: string
     #   description: Subscription channel for AI Broker application operator
@@ -28823,6 +29628,58 @@ spec:
       default: ""
+    # MAS Application Configuration - Facilities
+    # TODO: Fix type for storage sizes and max conn pool size
+    - name: mas_ws_facilities_size
+      type: string
+      description: Size of the Facilities Deployment
+      default: "small"
+    - name: mas_ws_facilities_routes_timeout
+      type: string
+      description: Optional. Connection timeout of the route.
+      default: ""
+    - name: mas_ws_facilities_liberty_extension_XML
+      type: string
+      description: Optional. Secret name containing XML extension for server.xml
+      default: ""
+    - name: mas_ws_facilities_vault_secret
+      type: string
+      description: Optional. Secret name containing AES encryption secret.
+      default: ""
+    - name: mas_ws_facilities_pull_policy
+      type: string
+      description: Optional. Pull Policy
+      default: ""
+    - name: mas_ws_facilities_storage_log_class
+      type: string
+      description: Define storage class for log
+      default: ""
+    - name: mas_ws_facilities_storage_log_mode
+      type: string
+      description: Define storage mode for log
+      default: ""
+    # - name: mas_ws_facilities_storage_log_size
+    #   description: Define storage size for log
+    #   type: integer
+    - name: mas_ws_facilities_storage_userfiles_class
+      type: string
+      description: Define storage class for userfiles
+      default: ""
+    - name: mas_ws_facilities_storage_userfiles_mode
+      type: string
+      description: Define storage mode for userfiles
+      default: ""
+    # - name: mas_ws_facilities_storage_userfiles_size
+    #   description: Define storage size for userfiles
+    #   type: integer
+    # - name: mas_ws_facilities_dwfagents
+    #   type: array
+    #   description: Define a list of dedicated workflow agents
+    #   default: []
+    # - name: mas_ws_facilities_db_maxconnpoolsize
+    #   description: Define maximum connection pool size
+    #   type: integer
     # 3. Upgrade
     # -------------------------------------------------------------------------
     - name: skip_compatibility_check
@@ -29140,7 +29997,7 @@ spec:
         name: mas-devops-suite-config
       timeout: '0'
       when:
-      - input: $(params.mas_app_channel_iot)$(params.mas_app_channel_manage)
+      - input: $(params.mas_app_channel_iot)$(params.mas_app_channel_manage)$(params.mas_app_channel_facilities)
         operator: notin
         values:
         - ''

mas-cli 13.24.0__py3-none-any.whl → 13.25.1__py3-none-any.whl

Potentially problematic release.

mas-cli 13.24.0py3-none-any.whl → 13.25.1py3-none-any.whl