[major] AI Broker / AI Service cleanup

Makefile

@@ -1,15 +1,15 @@
 #!/bin/bash
 
-.PHONY: ansible-build ansible-install ansible python python-devops python-cli tekton docker run clean create delete exec
+.PHONY: ansible-devops python python-devops python-cli tekton docker run clean create delete exec
 
 .DEFAULT_GOAL := all
 
-ansible-build:
+ansible-devops:
 	ansible-galaxy collection build --output-path image/cli/install ../ansible-devops/ibm/mas_devops --force
 	mv image/cli/install/ibm-mas_devops-100.0.0.tar.gz image/cli/install/ibm-mas_devops.tar.gz
-ansible-install:
-	ansible-galaxy collection install image/cli/install/ibm-mas_devops.tar.gz --force --no-deps
-ansible: ansible-build ansible-install
+
+# Tip: You can install this built collection using:
+# ansible-galaxy collection install image/cli/install/ibm-mas_devops.tar.gz --force --no-deps
 
 python-cli:
 	cd python && python -m build

docs/catalogs/v9-240625-amd64.md

@@ -35,7 +35,6 @@ What's New
     - IBM Maximo Optimizer v9.0
     - IBM Maximo Assist v9.0
     - IBM Maximo Predict v9.0
-    - IBM Maximo AI Broker v9.0
 - Support for Cloud Pak for Data v4.8
 - Support for MongoDb v6
 - **Security updates and bug fixes**

docs/catalogs/v9-240730-amd64.md

@@ -36,7 +36,6 @@ What's New
     - IBM Maximo Optimizer v9.0
     - IBM Maximo Assist v9.0
     - IBM Maximo Predict v9.0
-    - IBM Maximo AI Broker v9.0
 - Support for Cloud Pak for Data v4.8
 - support for OCP 4.15
 - Support for MongoDb v6

docs/guides/install-aiservice.md

@@ -45,7 +45,7 @@ If you have not already determined the catalog version for your installation, re
 
 Interactive Install
 -------------------------------------------------------------------------------
-Regardless of whether you are running a connected or disconnected installation, simply run the `mas aiservice-install` command and follow the prompts, the basic structure of the interactive flow is described below.  
+Regardless of whether you are running a connected or disconnected installation, simply run the `mas aiservice-install` command and follow the prompts, the basic structure of the interactive flow is described below.
 
 We will need the `entitlement.lic` file to perform the installation so we will mount your home directory into the running container.  When prompted you will be able to set license file to `/mnt/home/entitlement.lic` - <b> This is a prerequisite step, required only when `sls` has not been installed previously. </b>
 
@@ -90,7 +90,7 @@ The interactive install will guide you through a series of questioned designed t
     <cds-accordion-item title="Review Choices">
       <p>Before the install actually starts you will be presented with a summary of all your choices and a non-interactive command that will allow you to repeat the same installation without going through all the prompts again.</p>
     </cds-accordion-item>
-    
+
   </cds-accordion>
 </div>
 
@@ -105,8 +105,8 @@ docker run -e IBM_ENTITLEMENT_KEY -e SUPERUSER_PASSWORD -ti --rm -v ~:/mnt/home
   oc login --token=sha256~xxxx --server=https://xxx &&
   mas aiservice-install \
     --mas-catalog-version @@MAS_LATEST_CATALOG@@ \
-    --aibroker-instance-id aib1 \
-    --aibroker-channel 9.1.x \
+    --aiservice-instance-id aib1 \
+    --aiservice-channel 9.1.x \
     \
     --ibm-entitlement-key '${IBM_ENTITLEMENT_KEY}' \
     --license-file /mnt/home/entitlement.lic \
@@ -138,7 +138,6 @@ The engine that performs all tasks is written in Ansible, you can directly use t
     - IBM Data Reporter Operator
     - Red Hat Certificate Manager
     - Minio
-    - Mariadb
     - db2
 -  Aiservice installation
 

image/cli/masfvt/fvt-aiservice.yml

@@ -5,10 +5,10 @@
     # Image Pull Policy
     image_pull_policy: "{{ lookup('env', 'IMAGE_PULL_POLICY') }}"
     # MAS Details
-    mas_app_channel_aibroker: "{{ lookup('env', 'MAS_APP_CHANNEL_AIBROKER') }}"
+    aiservice_channel: "{{ lookup('env', 'AISERVICE_CHANNEL') }}"
     mas_workspace_id: "{{ lookup('env', 'MAS_WORKSPACE_ID') }}"
-    
-    aibroker_instance_id: "{{ lookup('env', 'AIBROKER_INSTANCE_ID') }}"
+
+    aiservice_instance_id: "{{ lookup('env', 'AISERVICE_INSTANCE_ID') }}"
     # FVT Configuration
     fvt_image_registry: "{{ lookup('env', 'FVT_IMAGE_REGISTRY') }}"
     fvt_artifactory_username: "{{ lookup('env', 'FVT_ARTIFACTORY_USERNAME') }}"
@@ -18,21 +18,21 @@
     # Pipeline Run Info
     devops_build_number: "{{ lookup('env', 'DEVOPS_BUILD_NUMBER') | default('0', True) }}"
     pipelinerun_name: "{{ lookup('env', 'PIPELINERUN_NAME') | default('mas-fvt-aibroker', True) }}-{{ devops_build_number }}"
-    pipelinerun_namespace: "{{ lookup('env', 'PIPELINERUN_NAMESPACE') | default('mas-' ~ aibroker_instance_id ~ '-pipelines', True) }}"
+    pipelinerun_namespace: "{{ lookup('env', 'PIPELINERUN_NAMESPACE') | default('mas-' ~ aiservice_instance_id ~ '-pipelines', True) }}"
   tasks:
     - name: "Debug"
       debug:
         msg:
           - "pipelinerun_name .................. {{ pipelinerun_name }}"
           - "pipelinerun_namespace ............. {{ pipelinerun_namespace }}"
           - ""
-          - "mas_app_channel_aibroker ........... {{ mas_app_channel_aibroker }}"
-          - "aibroker_instance_id ................... {{ aibroker_instance_id }}"
+          - "aiservice_channel ................. {{ aiservice_channel }}"
+          - "aiservice_instance_id ............. {{ aiservice_instance_id }}"
           - ""
           - "fvt_image_registry ................ {{ fvt_image_registry }}"
           - "fvt_artifactory_username .......... {{ fvt_artifactory_username }}"
           - "fvt_artifactory_token ............. {{ fvt_artifactory_token }}"
-          - "fvt_digest_aibroker ................ {{ fvt_digest_aibroker }}"
+          - "fvt_digest_aibroker ............... {{ fvt_digest_aibroker }}"
           - "ivt_digest_core ................... {{ ivt_digest_core }}"
 
     - name: "Start fvt-aiservice pipeline"

image/cli/masfvt/templates/mas-fvt-aiservice.yml.j2

@@ -19,10 +19,10 @@ spec:
     - name: image_pull_policy
       value: "{{ image_pull_policy }}"
     # MAS Info
-    - name: mas_app_channel_aibroker
-      value: "{{ mas_app_channel_aibroker }}"
+    - name: aiservice_channel
+      value: "{{ aiservice_channel }}"
     - name: mas_instance_id
-      value: "{{ aibroker_instance_id }}"
+      value: "{{ aiservice_instance_id }}"
     - name: mas_workspace_id
       value: "{{ mas_workspace_id }}"
     # Registry