If you are not already connected to an OpenShift cluster you will be prompted to provide the server URL & token to make a new connection. If you are already connected to a cluster you will be given the option to change to another cluster.
+You will be presented with a table of available catalogs with information about the different releases of MAS available in each.
+Confirm that you accept the IBM Maximo Application Suite license terms.
+AI Service requires both a `ReadWriteMany` and a `ReadWriteOnce` capable storage class to be available in the cluster. The installer has the ability to recognize certain storage class providers and will default to the most appropriate storage class in these cases:
+The names in brackets represent the `ReadWriteOnce` and `ReadWriteMany` class that will be used. Even when a recognized storage provider is detected you will be provided with the option to select your own storage classes if you wish.
+Provide the location of your license file (e.g., `/mnt/home/entitlement.lic`), contact information, and IBM entitlement key. If you have set the IBM_ENTITLEMENT_KEY environment variable, this field will be pre-filled.
Note: This step is only required if IBM Suite License Service (SLS) has not been previously installed in your cluster.
+Provide the configuration details for your AI Service instance:
+Choose how to configure AI Service dependencies:
+For each dependency, you can choose to install it automatically or provide connection details to an existing instance.
+Before the install 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.
+If you are not already connected to an OpenShift cluster you will be prompted to provide the server URL & token to make a new connection. If you are already connected to a cluster you will be given the option to change to another cluster
-You will be presented with a table of available catalogs with information about the different releases of MAS
-Confirm that you accept the IBM Maximo Application Suite license terms
-MAS requires both a `ReadWriteMany` and a `ReadWriteOnce` capable storage class to be available in the cluster. The installer has the ability to recognize certain storage class providers and will default to the most appropriate storage class in these cases:
-The names in brackets represent the `ReadWriteOnce` and `ReadWriteMany` class that will be used, in the case of NFS the same storage class will be used for both `ReadWriteOnce` and `ReadWriteMany` volumes. Even when a recognized storage provider is detected you will be provided with the option to select your own storages classes if you wish.
-When selecting your own storage classes you will be presented with a list of those available and must select both a `ReadWriteMany` and a `ReadWriteOnce` storage class. Unfortunately there is no way for the install to verify that the storage class selected actually supports the appropriate access mode, refer to the documentation from the storage class provider to determine whether your storage class supports `ReadWriteOnce` and/or `ReadWriteMany`.
-Provide the location of your license file, contact information, and IBM entitlement key (if you have set the IBM_ENTITLEMENT_KEY environment variable then this field will be pre-filled with that value already).
Provide the basic information about your Aiservice instance:
-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.
-Some Maximo applications support additional configuration, you will be taken through the configuration options for each application that you chose to install.
+NEW UPDATE: 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.
+--aiservice-channel), the binding is configured automatically:
+ --manage-aiservice-instance-id or --manage-aiservice-tenant-id parameters provided will be ignored, as the binding is automatically configured--aiservice-channel), you can bind Manage to an existing AI Service tenant:
+ --manage-aiservice-instance-id and --manage-aiservice-tenant-id parameters to specify the bindingThe 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).
diff --git a/docs/index.md b/docs/index.md index b3adcbde5ed..371518a991c 100644 --- a/docs/index.md +++ b/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) | ✓ | ✓ | diff --git a/image/cli/mascli/functions/internal/save_config b/image/cli/mascli/functions/internal/save_config index 2df46042ed7..3c47ac7bf9c 100644 --- a/image/cli/mascli/functions/internal/save_config +++ b/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 diff --git a/python/src/mas/cli/aiservice/install/argBuilder.py b/python/src/mas/cli/aiservice/install/argBuilder.py index 0cd16daf2e8..d259e867ab3 100644 --- a/python/src/mas/cli/aiservice/install/argBuilder.py +++ b/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 # ----------------------------------------------------------------------------- diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index 6d1e2126d1f..4e6ae41882b 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -13,6 +13,8 @@ import logging.handlers from sys import exit from os import path, getenv +from datetime import datetime +from dateutil.relativedelta import relativedelta import re import calendar @@ -41,7 +43,8 @@ TimeoutFormatValidator, StorageClassValidator, JsonValidator, - OptimizerInstallPlanValidator + OptimizerInstallPlanValidator, + BucketPrefixValidator ) from mas.devops.ocp import ( @@ -193,6 +196,7 @@ def processCatalogChoice(self) -> list: "Predict": "mas_predict_version", "Inspection": "mas_visualinspection_version", "Facilities": "mas_facilities_version", + "AI Service": "aiservice_version", } else: applications = { @@ -214,7 +218,7 @@ def processCatalogChoice(self) -> list: # Add 9.1-feature channel based off 9.0 to those apps that have not onboarded yet if key in self.chosenCatalog: tempChosenCatalog = self.chosenCatalog[key].copy() - if '9.1.x-feature' not in tempChosenCatalog: + if '9.1.x-feature' not in tempChosenCatalog and '9.0.x' in tempChosenCatalog: tempChosenCatalog.update({"9.1.x-feature": tempChosenCatalog["9.0.x"]}) self.catalogTable.append({"": application} | {key.replace(".x", ""): value for key, value in sorted(tempChosenCatalog.items(), reverse=True)}) @@ -491,6 +495,12 @@ def configOperationMode(self): " 2. Non-Production" ]) self.operationalMode = self.promptForInt("Operational Mode", default=1, min=1, max=2) + if self.operationalMode == 1: + self.setParam("environment_type", "production") + self.setParam("aiservice_odh_model_deployment_type", "raw") + else: + self.setParam("environment_type", "non-production") + self.setParam("aiservice_odh_model_deployment_type", "serverless") @logMethodCall def configRoutingMode(self): @@ -706,6 +716,12 @@ def configApps(self): self.configAppChannel("facilities") else: self.installFacilities = False + # TODO: May be have to change this condition if Manage 9.0 is not supporting AI Cofig Application + # AI Service is only installable on Manage 9.x as AI Config Application is not supported on Manage 8.x + if not self.getParam("mas_app_channel_manage").startswith("8."): + self.installAIService = self.yesOrNo("Install AI Service") + if self.installAIService: + self.configAIService() @logMethodCall def configAppChannel(self, appId): @@ -875,6 +891,148 @@ def facilitiesSettings(self) -> None: self.generateFacilitiesCfg(destination=facilitiesConfigsPath) self.setParam("mas_ws_facilities_config_file", "/workspace/configs/facilities-configs.yaml") + @logMethodCall + def configAIService(self): + self.printH1("Configure AI Service Instance") + self.printDescription([ + "Instance ID restrictions:", + " - Must be 3-12 characters long", + " - Must only use lowercase letters, numbers, and hypen (-) symbol", + " - Must start with a lowercase letter", + " - Must end with a lowercase letter or a number" + ]) + + # Install Db2 for AI Service + self.setParam("db2_action_aiservice", "install") + + self.promptForString("Instance ID", "aiservice_instance_id", validator=InstanceIDFormatValidator()) + self.params["aiservice_channel"] = prompt(HTML('