[minor] Support Integrated AI Service installation with MAS

.secrets.baseline

@@ -122,7 +122,7 @@
         "hashed_secret": "b60d121b438a380c343d5ec3c2037564b82ffef3",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 186,
+        "line_number": 211,
         "type": "Secret Keyword",
         "verified_result": null
       }

docs/guides/install.md

@@ -99,6 +99,12 @@ Interactive Install
 -------------------------------------------------------------------------------
 Regardless of whether you are running a connected or disconnected installation, simply run the `mas 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`
 
+!!! note "NEW: AI Service Installation Options"
+    **NEW UPDATE:** AI Service can now be installed in two ways:
+
+    - **Integrated Installation**: AI Service is now available as an option during the MAS installation process using the `mas install` command. You can select AI Service along with other MAS applications during the interactive application selection step or you can run Non-interactive command as well.
+    - **Standalone Installation**: For standalone AI Service installation, use the dedicated `mas aiservice-install` command to install AI Service independently of the main MAS installation.
+
 ```bash
 docker run -ti --rm -v ~:/mnt/home quay.io/ibmmas/cli:@@CLI_LATEST_VERSION@@ mas install
 ```
@@ -155,10 +161,29 @@ The interactive install will guide you through a series of questioned designed t
         <li>Monitor is only available for install if IoT is selected</li>
         <li>Assist and Predict are only available for install if Monitor is selected</li>
         <li>From MAS 9.1 onwards, Assist will be rebranded as Collaborate in the MAS UI. It will still appear as Assist in the MAS CLI and within the OpenShift Cluster, but from the MAS UI it will appear as Collaborate.</li>
+        <li><strong>NEW UPDATE:</strong> AI Service is now available as an installation option during the application selection step.</li>
       </ul>
     </cds-accordion-item>
     <cds-accordion-item title="Application Configuration">
       <p>Some Maximo applications support additional configuration, you will be taken through the configuration options for each application that you chose to install.</p>
+      <h4>NEW UPDATE: Maximo Manage - AI Service Binding</h4>
+      <p><strong>NEW UPDATE:</strong> When installing Maximo Manage, you can optionally bind it to an AI Service Tenant. This integration enables AI capabilities within Manage through the AI Config Application.</p>
+      <ul>
+        <li><strong>Installing AI Service with Manage:</strong> If you select AI Service during the application selection step (using <code>--aiservice-channel</code>), the binding is configured automatically:
+          <ul>
+            <li>A default tenant ID "user" is automatically created and bound to Manage</li>
+            <li>The AI Service instance being installed is automatically used for the binding</li>
+            <li>No additional configuration is required - the binding parameters are set automatically</li>
+            <li><strong>Important:</strong> When AI Service is being installed, any <code>--manage-aiservice-instance-id</code> or <code>--manage-aiservice-tenant-id</code> parameters provided will be ignored, as the binding is automatically configured</li>
+          </ul>
+        </li>
+        <li><strong>Using Existing AI Service:</strong> If AI Service is already installed in your cluster (not using <code>--aiservice-channel</code>), you can bind Manage to an existing AI Service tenant:
+          <ul>
+            <li><strong>Interactive Mode:</strong> You will be prompted to select from available AI Service instances and tenants</li>
+            <li><strong>Non-Interactive Mode:</strong> Use <code>--manage-aiservice-instance-id</code> and <code>--manage-aiservice-tenant-id</code> parameters to specify the binding</li>
+          </ul>
+        </li>
+      </ul>
     </cds-accordion-item>
     <cds-accordion-item title="Configure Databases">
       <p>The install supports the automatic provision of in-cluster MongoDb and Db2 databases for use with Maximo Application Suite, you may also choose to bring your own (BYO) by providing the necessary configuration files (which the installer will also help you create).</p>

docs/index.md

@@ -47,6 +47,7 @@ Not all functions supported in the container image are available in the standalo
 | CLI Function                                               | Image    | Binary   |
 | ---------------------------------------------------------- | :------: | :------: |
 | [install](guides/install.md)                               | ✓ | ✓ |
+| [aiservice-install](guides/aiservice-install.md)           | ✓ | ✓ |
 | [update](commands/update.md)                               | ✓ | ✓ |
 | [upgrade](commands/upgrade.md)                             | ✓ | ✓ |
 | [uninstall](commands/uninstall.md)                         | ✓ | ✓ |

image/cli/mascli/functions/internal/save_config

@@ -208,11 +208,11 @@ export MAS_APP_SETTINGS_DB2_SCHEMA=$MAS_APP_SETTINGS_DB2_SCHEMA
 export MAS_APP_SETTINGS_TABLESPACE=$MAS_APP_SETTINGS_TABLESPACE
 export MAS_APP_SETTINGS_INDEXSPACE=$MAS_APP_SETTINGS_INDEXSPACE
 
-export MAS_APP_SETTINGS_CRYPTO_KEY=$MAS_APP_SETTINGS_CRYPTO_KEY
-export MAS_APP_SETTINGS_CRYPTOX_KEY=$MAS_APP_SETTINGS_CRYPTOX_KEY
-export MAS_APP_SETTINGS_OLD_CRYPTO_KEY=$MAS_APP_SETTINGS_OLD_CRYPTO_KEY
-export MAS_APP_SETTINGS_OLD_CRYPTOX_KEY=$MAS_APP_SETTINGS_OLD_CRYPTOX_KEY
-export MAS_APP_SETTINGS_OVERRIDE_ENCRYPTION_SECRETS_FLAG=$MAS_APP_SETTINGS_OVERRIDE_ENCRYPTION_SECRETS_FLAG
+export MAS_MANAGE_ENCRYPTIONSECRET_CRYPTO_KEY=$MAS_MANAGE_ENCRYPTIONSECRET_CRYPTO_KEY
+export MAS_MANAGE_ENCRYPTIONSECRET_CRYPTOX_KEY=$MAS_MANAGE_ENCRYPTIONSECRET_CRYPTOX_KEY
+export MAS_MANAGE_ENCRYPTIONSECRET_OLD_CRYPTO_KEY=$MAS_MANAGE_ENCRYPTIONSECRET_OLD_CRYPTO_KEY
+export MAS_MANAGE_ENCRYPTIONSECRET_OLD_CRYPTOX_KEY=$MAS_MANAGE_ENCRYPTIONSECRET_OLD_CRYPTOX_KEY
+export MAS_MANAGE_WS_DB_ENCRYPTIONSECRET=$MAS_MANAGE_WS_DB_ENCRYPTIONSECRET
 
 export MAS_APP_SETTINGS_SERVER_BUNDLES_SIZE=$MAS_APP_SETTINGS_SERVER_BUNDLES_SIZE
 

python/src/mas/cli/aiservice/install/argBuilder.py

@@ -35,7 +35,7 @@ def buildCommand(self) -> str:
 
         command += f" --ibm-entitlement-key $IBM_ENTITLEMENT_KEY{newline}"
 
-        # Aibroker Instance Id
+        # AI Service Instance Id
         command += f"  --aiservice-instance-id  \"{self.getParam('aiservice_instance_id')}\"{newline}"
 
         # MAS Advanced Configuration
@@ -87,8 +87,8 @@ def buildCommand(self) -> str:
 
         # Approvals
         # -----------------------------------------------------------------------------
-        if self.getParam('approval_aibroker') != "":
-            command += f"  --approval-aibroker \"{self.getParam('approval_aibroker')}\"{newline}"
+        if self.getParam('approval_aiservice') != "":
+            command += f"  --approval-aiservice \"{self.getParam('approval_aiservice')}\"{newline}"
 
         # More Options
         # -----------------------------------------------------------------------------