mas-cli 11.5.0__py3-none-any.whl → 11.7.0__py3-none-any.whl

mas/cli/install/settings/additionalConfigs.py

@@ -63,7 +63,7 @@ class AdditionalConfigsMixin():
             self.additionalConfigsSecret = additionalConfigsSecret
 
     def podTemplates(self) -> None:
-        if self.interactiveMode:
+        if self.interactiveMode and self.showAdvancedOptions:
             self.printH1("Configure Pod Templates")
             self.printDescription([
                 "The CLI supports two pod template profiles out of the box that allow you to reconfigure MAS for either a guaranteed or best effort QoS level",
@@ -137,40 +137,40 @@ class AdditionalConfigsMixin():
 
             apps = {
                 "mas_app_channel_assist": {
-                    "dir": self.getParam("mas_manual_cert_dir") + "/assist/",
+                    "dir": self.manualCertsDir + "/assist/",
                     "keyPrefix": "assist."
                 },
                 "mas_app_channel_manage": {
-                    "dir": self.getParam("mas_manual_cert_dir") + "/manage/",
+                    "dir": self.manualCertsDir + "/manage/",
                     "keyPrefix": "manage."
                 },
                 "mas_app_channel_iot": {
-                    "dir": self.getParam("mas_manual_cert_dir") + "/iot/",
+                    "dir": self.manualCertsDir + "/iot/",
                     "keyPrefix": "iot."
                 },
                 "mas_app_channel_monitor": {
-                    "dir": self.getParam("mas_manual_cert_dir") + "/monitor/",
+                    "dir": self.manualCertsDir + "/monitor/",
                     "keyPrefix": "monitor."
                 },
                 "mas_app_channel_predict": {
-                    "dir": self.getParam("mas_manual_cert_dir") + "/predict/",
+                    "dir": self.manualCertsDir + "/predict/",
                     "keyPrefix": "predict."
                 },
                 "mas_app_channel_visualinspection": {
-                    "dir": self.getParam("mas_manual_cert_dir") + "/visualinspection/",
+                    "dir": self.manualCertsDir + "/visualinspection/",
                     "keyPrefix": "visualinspection."
                 },
                 "mas_app_channel_optimizer": {
-                    "dir": self.getParam("mas_manual_cert_dir") + "/optimizer/",
+                    "dir": self.manualCertsDir + "/optimizer/",
                     "keyPrefix": "optimizer."
                 }
             }
 
             for file in ["ca.crt", "tls.crt", "tls.key"]:
-                if file not in map(path.basename, glob(f'{self.getParam("mas_manual_cert_dir")}/core/*')):
-                    self.fatalError(f'{file} is not present in {self.getParam("mas_manual_cert_dir")}/core/')
+                if file not in map(path.basename, glob(f'{self.manualCertsDir}/core/*')):
+                    self.fatalError(f'{file} is not present in {self.manualCertsDir}/core/')
             for ext in extensions:
-                certsSecret = self.addFilesToSecret(certsSecret, self.getParam("mas_manual_cert_dir") + '/core/', ext, "core.")
+                certsSecret = self.addFilesToSecret(certsSecret, self.manualCertsDir + '/core/', ext, "core.")
 
             for app in apps:
                 if self.getParam(app) != "":

mas/cli/install/settings/db2Settings.py

@@ -18,12 +18,39 @@ class Db2SettingsMixin():
         # The channel used for Db2 used has not changed since the January 2024 catalog update
         self.params["db2_channel"] = "v110509.0"
 
+        # If neither Iot or Manage is being installed, we have nothing to do
         if not self.installIoT and not self.installManage:
             print_formatted_text("No applications have been selected that require a Db2 installation")
             self.setParam("db2_action_system", "none")
             self.setParam("db2_action_manage", "none")
             return
 
+        # For now we are limiting users to bring your own database for Manage on s390x
+        # Eventually we will be able to remove this clause and allow the standard logic to work for both s390x and amd64
+        if self.architecture == "s390x" and self.installManage:
+            self.printDescription([
+                "Installation of a Db2 instance using the IBM Db2 Universal Operator is not currently supported on s390x, please provide configuration details for the database you wish to use.",
+            ])
+            instanceId = self.getParam('mas_instance_id')
+            workspaceId = self.getParam("mas_workspace_id")
+
+            self.setParam("mas_appws_bindings_jdbc_manage", "workspace-application")
+            self.setParam("db2_action_manage", "byo")
+            self.selectLocalConfigDir()
+
+            # Check if a configuration already exists before creating a new one
+            jdbcCfgFile = path.join(self.localConfigDir, f"jdbc-{instanceId}-manage.yaml")
+            print_formatted_text(f"Searching for Manage database configuration file in {jdbcCfgFile} ...")
+            if path.exists(jdbcCfgFile):
+                if self.yesOrNo(f"Manage database configuration file 'jdbc-{instanceId}-manage.yaml' already exists.  Do you want to generate a new one"):
+                    self.generateJDBCCfg(instanceId=instanceId, scope="workspace-application", workspaceId=workspaceId, appId="manage", destination=jdbcCfgFile)
+            else:
+                print_formatted_text(f"Expected file ({jdbcCfgFile}) was not found, generating a valid Manage database configuration file now ...")
+                self.generateJDBCCfg(instanceId=instanceId, scope="workspace-application", workspaceId=workspaceId, appId="manage", destination=jdbcCfgFile)
+            return
+
+        # Proceed as normal
+        # We know we are installing either IoT or Manage, and on amd64 target architecture
         self.printDescription([
             "The installer can setup one or more IBM Db2 instances in your OpenShift cluster for the use of applications that require a JDBC datasource (IoT, Manage, Monitor, & Predict) or you may choose to configure MAS to use an existing database"
         ])
@@ -126,48 +153,51 @@ class Db2SettingsMixin():
 
         # Do we need to configure Db2u?
         if self.getParam("db2_action_system") == "install" or self.getParam("db2_action_manage") == "install":
-            self.printH2("Installation Namespace")
-            self.promptForString("Install namespace", "db2_namespace", default="db2u")
-
-            # Node Affinity & Tolerations
-            # -------------------------------------------------------------------------
-            self.printH2("Node Affinity and Tolerations")
-            self.printDescription([
-                "Note that the same settings are applied to both the IoT and Manage Db2 instances",
-                "Use existing node labels and taints to control scheduling of the Db2 workload in your cluster",
-                "For more information refer to the Red Hat documentation:",
-                " - <u>https://docs.openshift.com/container-platform/4.12/nodes/scheduling/nodes-scheduler-node-affinity.html</u>",
-                " - <u>https://docs.openshift.com/container-platform/4.12/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u>"
-            ])
-
-            if self.yesOrNo("Configure node affinity"):
-                self.promptForString(" + Key", "db2_affinity_key")
-                self.promptForString(" + Value", "db2_affinity_value")
-
-            if self.yesOrNo("Configure node tolerations"):
-                self.promptForString(" + Key", "db2_tolerate_key")
-                self.promptForString(" + Value", "db2_tolerate_value")
-                self.promptForString(" + Effect", "db2_tolerate_effect")
-
-            self.printH2("Database CPU & Memory")
-            self.printDescription([
-                "Note that the same settings are applied to both the IoT and Manage Db2 instances"
-            ])
-
-            if self.yesOrNo("Customize CPU and memory request/limit"):
-                self.promptForString(" + CPU Request", "db2_cpu_requests", default=self.getParam("db2_cpu_requests"))
-                self.promptForString(" + CPU Limit", "db2_cpu_limits", default=self.getParam("db2_cpu_limits"))
-                self.promptForString(" + Memory Request", "db2_memory_requests", default=self.getParam("db2_memory_requests"))
-                self.promptForString(" + Memory Limit", "db2_memory_limits", default=self.getParam("db2_memory_limits"))
-
-            self.printH2("Database Storage Capacity")
-            self.printDescription([
-                "Note that the same settings are applied to both the IoT and Manage Db2 instances"
-            ])
-
-            if self.yesOrNo("Customize storage capacity"):
-                self.promptForString(" + Data Volume", "db2_data_storage_size", default=self.getParam("db2_data_storage_size"))
-                self.promptForString(" + Temporary Volume", "db2_temp_storage_size", default=self.getParam("db2_temp_storage_size"))
-                self.promptForString(" + Metadata Volume", "db2_meta_storage_size", default=self.getParam("db2_meta_storage_size"))
-                self.promptForString(" + Transaction Logs Volume", "db2_logs_storage_size", default=self.getParam("db2_logs_storage_size"))
-                self.promptForString(" + Backup Volume", "db2_backup_storage_size", default=self.getParam("db2_backup_storage_size"))
+            if self.showAdvancedOptions:
+                self.printH2("Installation Namespace")
+                self.promptForString("Install namespace", "db2_namespace", default="db2u")
+
+                # Node Affinity & Tolerations
+                # -------------------------------------------------------------------------
+                self.printH2("Node Affinity and Tolerations")
+                self.printDescription([
+                    "Note that the same settings are applied to both the IoT and Manage Db2 instances",
+                    "Use existing node labels and taints to control scheduling of the Db2 workload in your cluster",
+                    "For more information refer to the Red Hat documentation:",
+                    " - <u>https://docs.openshift.com/container-platform/4.12/nodes/scheduling/nodes-scheduler-node-affinity.html</u>",
+                    " - <u>https://docs.openshift.com/container-platform/4.12/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u>"
+                ])
+
+                if self.yesOrNo("Configure node affinity"):
+                    self.promptForString(" + Key", "db2_affinity_key")
+                    self.promptForString(" + Value", "db2_affinity_value")
+
+                if self.yesOrNo("Configure node tolerations"):
+                    self.promptForString(" + Key", "db2_tolerate_key")
+                    self.promptForString(" + Value", "db2_tolerate_value")
+                    self.promptForString(" + Effect", "db2_tolerate_effect")
+
+                self.printH2("Database CPU & Memory")
+                self.printDescription([
+                    "Note that the same settings are applied to both the IoT and Manage Db2 instances"
+                ])
+
+                if self.yesOrNo("Customize CPU and memory request/limit"):
+                    self.promptForString(" + CPU Request", "db2_cpu_requests", default=self.getParam("db2_cpu_requests"))
+                    self.promptForString(" + CPU Limit", "db2_cpu_limits", default=self.getParam("db2_cpu_limits"))
+                    self.promptForString(" + Memory Request", "db2_memory_requests", default=self.getParam("db2_memory_requests"))
+                    self.promptForString(" + Memory Limit", "db2_memory_limits", default=self.getParam("db2_memory_limits"))
+
+                self.printH2("Database Storage Capacity")
+                self.printDescription([
+                    "Note that the same settings are applied to both the IoT and Manage Db2 instances"
+                ])
+
+                if self.yesOrNo("Customize storage capacity"):
+                    self.promptForString(" + Data Volume", "db2_data_storage_size", default=self.getParam("db2_data_storage_size"))
+                    self.promptForString(" + Temporary Volume", "db2_temp_storage_size", default=self.getParam("db2_temp_storage_size"))
+                    self.promptForString(" + Metadata Volume", "db2_meta_storage_size", default=self.getParam("db2_meta_storage_size"))
+                    self.promptForString(" + Transaction Logs Volume", "db2_logs_storage_size", default=self.getParam("db2_logs_storage_size"))
+                    self.promptForString(" + Backup Volume", "db2_backup_storage_size", default=self.getParam("db2_backup_storage_size"))
+            else:
+                self.setParam("db2_namespace", "db2u")

mas/cli/install/settings/kafkaSettings.py

@@ -24,15 +24,18 @@ class KafkaSettingsMixin():
             if self.yesOrNo("Create system Kafka instance using one of the supported providers"):
                 self.setParam("kafka_action_system", "install")
 
-                self.printDescription([
-                    "",
-                    "Kafka Provider:",
-                    "  1. Strimzi (opensource)",
-                    "  2. Red Hat AMQ Streams (requires a separate license)",
-                    "  3. IBM Cloud Event Streams (paid IBM Cloud service)",
-                    "  4. AWS MSK (paid AWS service)"
-                ])
-                self.promptForListSelect("Select Kafka provider", ["strimzi", "redhat", "ibm", "aws"], "kafka_provider")
+                if self.showAdvancedOptions:
+                    self.printDescription([
+                        "",
+                        "Kafka Provider:",
+                        "  1. Strimzi (opensource)",
+                        "  2. Red Hat AMQ Streams (requires a separate license)",
+                        "  3. IBM Cloud Event Streams (paid IBM Cloud service)",
+                        "  4. AWS MSK (paid AWS service)"
+                    ])
+                    self.promptForListSelect("Select Kafka provider", ["strimzi", "redhat", "ibm", "aws"], "kafka_provider")
+                else:
+                    self.setParam("kafka_provider", "strimzi")
 
                 if self.getParam("kafka_provider") == "strimzi":
                     self.printDescription([
@@ -42,7 +45,8 @@ class KafkaSettingsMixin():
                         " - If you are using the latest available operator catalog then the default version below can be accepted",
                         " - If you are using older operator catalogs (e.g. in a disconnected install) you should confirm the supported versions in your OperatorHub"
                     ])
-                    self.promptForString("Install namespace", "kafka_namespace", default="strimzi")
+                    if self.showAdvancedOptions:
+                        self.promptForString("Strimzi namespace", "kafka_namespace", default="strimzi")
                     self.promptForString("Kafka version", "kafka_version", default="3.7.0")
 
                 elif self.getParam("kafka_provider") == "redhat":

mas/cli/install/settings/manageSettings.py

@@ -125,53 +125,57 @@ class ManageSettingsMixin():
                     exit(1)
 
     def manageSettingsDatabase(self) -> None:
-        self.printH2("Maximo Manage Settings - Database")
-        self.printDescription(["Customise the schema, tablespace, indexspace, and encryption settings used by Manage"])
-
-        if self.yesOrNo("Customize database settings"):
-            self.promptForString("Schema", "mas_app_settings_db2_schema", default="maximo")
-            self.promptForString("Tablespace", "mas_app_settings_tablespace", default="MAXDATA")
-            self.promptForString("Indexspace", "mas_app_settings_indexspace", default="MAXINDEX")
-
-            if self.yesOrNo("Customize database encryption settings"):
-                self.promptForString("MXE_SECURITY_CRYPTO_KEY", "mas_app_settings_crypto_key")
-                self.promptForString("MXE_SECURITY_CRYPTOX_KEY", "mas_app_settings_cryptox_key")
-                self.promptForString("MXE_SECURITY_OLD_CRYPTO_KEY", "mas_app_settings_old_crypto_key")
-                self.promptForString("MXE_SECURITY_OLD_CRYPTOX_KEY", "mas_app_settings_old_cryptox_key")
-                self.yesOrNo("Override database encryption secrets with provided keys", "mas_app_settings_override_encryption_secrets_flag")
+        if self.showAdvancedOptions:
+            self.printH2("Maximo Manage Settings - Database")
+            self.printDescription(["Customise the schema, tablespace, indexspace, and encryption settings used by Manage"])
+
+            if self.yesOrNo("Customize database settings"):
+                self.promptForString("Schema", "mas_app_settings_db2_schema", default="maximo")
+                self.promptForString("Tablespace", "mas_app_settings_tablespace", default="MAXDATA")
+                self.promptForString("Indexspace", "mas_app_settings_indexspace", default="MAXINDEX")
+
+                if self.yesOrNo("Customize database encryption settings"):
+                    self.promptForString("MXE_SECURITY_CRYPTO_KEY", "mas_app_settings_crypto_key")
+                    self.promptForString("MXE_SECURITY_CRYPTOX_KEY", "mas_app_settings_cryptox_key")
+                    self.promptForString("MXE_SECURITY_OLD_CRYPTO_KEY", "mas_app_settings_old_crypto_key")
+                    self.promptForString("MXE_SECURITY_OLD_CRYPTOX_KEY", "mas_app_settings_old_cryptox_key")
+                    self.yesOrNo("Override database encryption secrets with provided keys", "mas_app_settings_override_encryption_secrets_flag")
 
     def manageSettingsServerBundleConfig(self) -> None:
-        self.printH2("Maximo Manage Settings - Server Bundles")
-        self.printDescription([
-            "Define how you want to configure Manage servers:",
-            " - You can have one or multiple Manage servers distributing workload",
-            " - Additionally, you can choose to include JMS server for messaging queues",
-            "",
-            "Configurations:",
-            "  1. Deploy the 'all' server pod only (workload is concentrated in just one server pod but consumes less resource)",
-            "  2. Deploy the 'all' and 'jms' bundle pods (workload is concentrated in just one server pod and includes jms server)"
-        ])
-
-        if not self.isSNO():
+        if self.showAdvancedOptions:
+            self.printH2("Maximo Manage Settings - Server Bundles")
             self.printDescription([
-                "  3. Deploy the 'mea', 'report', 'ui' and 'cron' bundle pods (workload is distributed across multiple server pods)",
-                "  4. Deploy the 'mea', 'report', 'ui', 'cron' and 'jms' bundle pods (workload is distributed across multiple server pods and includes jms server)"
+                "Define how you want to configure Manage servers:",
+                " - You can have one or multiple Manage servers distributing workload",
+                " - Additionally, you can choose to include JMS server for messaging queues",
+                "",
+                "Configurations:",
+                "  1. Deploy the 'all' server pod only (workload is concentrated in just one server pod but consumes less resource)",
+                "  2. Deploy the 'all' and 'jms' bundle pods (workload is concentrated in just one server pod and includes jms server)"
             ])
 
-        manageServerBundleSelection = self.promptForString("Select a server bundle configuration")
+            if not self.isSNO():
+                self.printDescription([
+                    "  3. Deploy the 'mea', 'report', 'ui' and 'cron' bundle pods (workload is distributed across multiple server pods)",
+                    "  4. Deploy the 'mea', 'report', 'ui', 'cron' and 'jms' bundle pods (workload is distributed across multiple server pods and includes jms server)"
+                ])
 
-        if manageServerBundleSelection == "1":
-            self.setParam("mas_app_settings_server_bundles_size", "dev")
-        elif manageServerBundleSelection == "2":
-            self.setParam("mas_app_settings_server_bundles_size", "snojms")
-            self.setParam("mas_app_settings_persistent_volumes_flag", "true")
-        elif manageServerBundleSelection == "3":
-            self.setParam("mas_app_settings_server_bundles_size", "small")
-        elif manageServerBundleSelection == "4":
-            self.setParam("mas_app_settings_server_bundles_size", "jms")
-            self.setParam("mas_app_settings_persistent_volumes_flag", "true")
+            manageServerBundleSelection = self.promptForString("Select a server bundle configuration")
+
+            if manageServerBundleSelection == "1":
+                self.setParam("mas_app_settings_server_bundles_size", "dev")
+            elif manageServerBundleSelection == "2":
+                self.setParam("mas_app_settings_server_bundles_size", "snojms")
+                self.setParam("mas_app_settings_persistent_volumes_flag", "true")
+            elif manageServerBundleSelection == "3":
+                self.setParam("mas_app_settings_server_bundles_size", "small")
+            elif manageServerBundleSelection == "4":
+                self.setParam("mas_app_settings_server_bundles_size", "jms")
+                self.setParam("mas_app_settings_persistent_volumes_flag", "true")
+            else:
+                self.fatalError("Invalid selection")
         else:
-            self.fatalError("Invalid selection")
+            self.setParam("mas_app_settings_server_bundles_size", "dev")
 
     def manageSettingsJMS(self) -> None:
         if self.getParam("mas_app_settings_server_bundles_size") in ["jms", "snojms"]:
@@ -219,7 +223,7 @@ class ManageSettingsMixin():
         self.promptForString("Secondary languages", "mas_app_settings_secondary_langs")
 
     def manageSettingsCP4D(self) -> None:
-        if self.getParam("mas_app_channel_manage") in ["8.7.x", "9.0.x"]:
+        if self.getParam("mas_app_channel_manage") in ["8.7.x", "9.0.x"] and self.showAdvancedOptionsshowAdvancedOptions:
             self.printDescription([
                 "Integration with Cognos Analytics provides additional support for reporting features in Maximo Manage, for more information refer to the documentation online: ",
                 "    <u>https://ibm.biz/BdMuxs</u>"
@@ -246,3 +250,29 @@ class ManageSettingsMixin():
             self.manageSettingsTimezone()
             self.manageSettingsLanguages()
             self.manageSettingsCP4D()
+
+    def aibrokerSettings(self) -> None:
+        if self.installAiBroker:
+            self.printH2("Maximo AI Broker Settings - Storage, WatsonX, MariaDB details")
+            self.printDescription(["Customise AI Broker details"])
+            self.promptForString("Storage provider", "mas_aibroker_storage_provider")
+            self.promptForString("Storage access key", "mas_aibroker_storage_accesskey")
+            self.promptForString("Storage secret key", "mas_aibroker_storage_secretkey")
+            self.promptForString("Storage host", "mas_aibroker_storage_host")
+            self.promptForString("Storage port", "mas_aibroker_storage_port")
+            self.promptForString("Storage ssl", "mas_aibroker_storage_ssl")
+            self.promptForString("Storage region", "mas_aibroker_storage_region")
+            self.promptForString("Storage pipelines bucket", "mas_aibroker_storage_pipelines_bucket")
+            self.promptForString("Storage tenants bucket", "mas_aibroker_storage_tenants_bucket")
+            self.promptForString("Storage templates bucket", "mas_aibroker_storage_templates_bucket")
+
+            self.promptForString("Watsonxai api key", "mas_aibroker_watsonxai_apikey")
+            self.promptForString("Watsonxai machine learning url", "mas_aibroker_watsonxai_url")
+            self.promptForString("Watsonxai project id", "mas_aibroker_watsonxai_project_id")
+
+            self.promptForString("Database host", "mas_aibroker_db_host")
+            self.promptForString("Database port", "mas_aibroker_db_port")
+            self.promptForString("Database user", "mas_aibroker_db_user")
+            self.promptForString("Database name", "mas_aibroker_db_database")
+            self.promptForString("Database Secretname", "mas_aibroker_db_secret_name")
+            self.promptForString("Database password", "mas_aibroker_db_secret_value")

mas/cli/install/settings/mongodbSettings.py

@@ -0,0 +1,42 @@
+# *****************************************************************************
+# Copyright (c) 2024 IBM Corporation and other Contributors.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# *****************************************************************************
+
+from os import path
+from prompt_toolkit import print_formatted_text
+
+
+class MongoDbSettingsMixin():
+    def configMongoDb(self) -> None:
+        self.printH1("Configure MongoDb")
+        self.printDescription([
+            "The installer can setup mongoce in your OpenShift cluster (available only for amd64) or you may choose to configure MAS to use an existing mongodb"
+        ])
+
+        if self.architecture != "s390x" and self.yesOrNo("Create MongoDb cluster using MongoDb Community Edition Operator"):
+            if self.showAdvancedOptions:
+                self.promptForString("MongoDb namespace", "mongodb_namespace", default="mongoce")
+            self.setParam("mongodb_action", "install")
+            self.setParam("sls_mongodb_cfg_file", f"/workspace/configs/mongo-{self.getParam('mongodb_namespace')}.yml")
+        else:
+            self.setParam("mongodb_action", "byo")
+            self.setParam("sls_mongodb_cfg_file", "/workspace/additional-configs/mongodb-system.yaml")
+            self.selectLocalConfigDir()
+
+            instanceId = self.getParam('mas_instance_id')
+            # Check if a configuration already exists before creating a new one
+            mongoCfgFile = path.join(self.localConfigDir, "mongodb-system.yaml")
+
+            print_formatted_text(f"Searching for system mongodb configuration file in {mongoCfgFile} ...")
+            if path.exists(mongoCfgFile):
+                if self.yesOrNo("System mongodb configuration file 'mongodb-system.yaml' already exists.  Do you want to generate a new one"):
+                    self.generateMongoCfg(instanceId=instanceId, destination=mongoCfgFile)
+            else:
+                print_formatted_text(f"Expected file ({mongoCfgFile}) was not found, generating a valid system mongodb configuration file now ...")
+                self.generateMongoCfg(instanceId=instanceId, destination=mongoCfgFile)

mas/cli/install/settings/turbonomicSettings.py

@@ -14,17 +14,18 @@ from mas.devops.mas import isAirgapInstall
 class TurbonomicSettingsMixin():
 
     def configTurbonomic(self) -> None:
-        self.printH1("Configure Turbonomic")
-        self.printDescription([
-            "The IBM Turbonomic hybrid cloud cost optimization platform allows you to eliminate this guesswork with solutions that save time and optimize costs",
-            " - Learn more: <u>https://www.ibm.com/products/turbonomic</u>"
-        ])
+        if self.showAdvancedOptions:
+            self.printH1("Configure Turbonomic")
+            self.printDescription([
+                "The IBM Turbonomic hybrid cloud cost optimization platform allows you to eliminate this guesswork with solutions that save time and optimize costs",
+                " - Learn more: <u>https://www.ibm.com/products/turbonomic</u>"
+            ])
 
-        if isAirgapInstall(self.dynamicClient):
-            self.printHighlight("The Turbonomic Kubernetes Operator does not support disconnected installation at this time")
-        elif self.yesOrNo("Configure IBM Turbonomic integration"):
-            self.promptForString("Turbonomic Target Name", "turbonomic_target_name")
-            self.promptForString("Turbonomic Server URL", "turbonomic_server_url")
-            self.promptForString("Turbonomic Server Version", "turbonomic_server_version")
-            self.promptForString("Turbonomic Username", "turbonomic_username")
-            self.promptForString("Turbonomic Password", "turbonomic_password", isPassword=True)
+            if isAirgapInstall(self.dynamicClient):
+                self.printHighlight("The Turbonomic Kubernetes Operator does not support disconnected installation at this time")
+            elif self.yesOrNo("Configure IBM Turbonomic integration"):
+                self.promptForString("Turbonomic Target Name", "turbonomic_target_name")
+                self.promptForString("Turbonomic Server URL", "turbonomic_server_url")
+                self.promptForString("Turbonomic Server Version", "turbonomic_server_version")
+                self.promptForString("Turbonomic Username", "turbonomic_username")
+                self.promptForString("Turbonomic Password", "turbonomic_password", isPassword=True)

mas/cli/install/summarizer.py

@@ -20,6 +20,7 @@ logger = logging.getLogger(__name__)
 class InstallSummarizerMixin():
     def ocpSummary(self) -> None:
         self.printH2("OpenShift Container Platform")
+        self.printSummary("Worker Node Architecture", self.architecture)
         self.printSummary("Storage Class Provider", self.storageClassProvider)
         self.printParamSummary("ReadWriteOnce Storage Class", "storage_class_rwo")
         self.printParamSummary("ReadWriteMany Storage Class", "storage_class_rwx")
@@ -35,13 +36,6 @@ class InstallSummarizerMixin():
         self.printSummary("Skip Pre-Install Healthcheck", "Yes" if self.getParam('skip_pre_check') == "true" else "No")
         self.printSummary("Skip Grafana-Install", "Yes" if self.getParam('grafana_action') == "none" else "No")
 
-    def icrSummary(self) -> None:
-        self.printH2("IBM Container Registry Credentials")
-        self.printSummary("IBM Entitlement Key", f"{self.params['ibm_entitlement_key'][0:8]}<snip>")
-        if self.devMode:
-            self.printSummary("Artifactory Username", self.params['artifactory_username'])
-            self.printSummary("Artifactory Token", f"{self.params['artifactory_token'][0:8]}<snip>")
-
     def masSummary(self) -> None:
         operationalModeNames = ["", "Production", "Non-Production"]
 
@@ -77,7 +71,7 @@ class InstallSummarizerMixin():
 
         if self.getParam("mas_manual_cert_mgmt") != "":
             print()
-            self.printParamSummary("Manual Certificates", "mas_manual_cert_dir")
+            self.printSummary("Manual Certificates", self.manualCertsDir)
         else:
             print()
             self.printSummary("Manual Certificates", "Not Configured")
@@ -155,6 +149,32 @@ class InstallSummarizerMixin():
         else:
             self.printSummary("Visual Inspection", "Do Not Install")
 
+    def aibrokerSummary(self) -> None:
+        if self.installAiBroker:
+            self.printSummary("AI Broker", self.params["mas_app_channel_aibroker"])
+            print_formatted_text(HTML("  <SkyBlue>+ Maximo AI Broker Settings</SkyBlue>"))
+            self.printParamSummary("  + Storage provider", "mas_aibroker_storage_provider")
+            self.printParamSummary("  + Storage access key", "mas_aibroker_storage_accesskey")
+            self.printParamSummary("  + Storage secret key", "mas_aibroker_storage_secretkey")
+            self.printParamSummary("  + Storage host", "mas_aibroker_storage_host")
+            self.printParamSummary("  + Storage port", "mas_aibroker_storage_port")
+            self.printParamSummary("  + Storage ssl", "mas_aibroker_storage_ssl")
+            self.printParamSummary("  + Storage region", "mas_aibroker_storage_region")
+            self.printParamSummary("  + Storage pipelines bucket", "mas_aibroker_storage_pipelines_bucket")
+            self.printParamSummary("  + Storage tenants bucket", "mas_aibroker_storage_tenants_bucket")
+            self.printParamSummary("  + Storage templates bucket", "mas_aibroker_storage_templates_bucket")
+            self.printParamSummary("  + Watsonxai api key", "mas_aibroker_watsonxai_apikey")
+            self.printParamSummary("  + Watsonxai machine learning url", "mas_aibroker_watsonxai_url")
+            self.printParamSummary("  + Watsonxai project id", "mas_aibroker_watsonxai_project_id")
+            self.printParamSummary("  + Database host", "mas_aibroker_db_host")
+            self.printParamSummary("  + Database port", "mas_aibroker_db_port")
+            self.printParamSummary("  + Database user", "mas_aibroker_db_user")
+            self.printParamSummary("  + Database name", "mas_aibroker_db_database")
+            self.printParamSummary("  + Database Secretname", "mas_aibroker_db_secret_name")
+            self.printParamSummary("  + Database password", "mas_aibroker_db_secret_value")
+        else:
+            self.printSummary("AI Broker", "Do Not Install")
+
     def manageSummary(self) -> None:
         if self.installManage:
             self.printSummary("Manage", self.params["mas_app_channel_manage"])
@@ -248,13 +268,14 @@ class InstallSummarizerMixin():
         self.printH2("IBM Suite License Service")
         self.printSummary("License File", self.slsLicenseFileLocal)
         self.printParamSummary("IBM Open Registry", "sls_icr_cpopen")
+        self.printParamSummary("Namespace", "sls_namespace")
 
     def cosSummary(self) -> None:
         self.printH2("Cloud Object Storage")
         if self.getParam("cos_type") != "":
             self.printParamSummary("Type", "cos_type")
-            if self.getParam("cos_resourcegroup") != "":
-                self.printParamSummary("Resource Group", "cos_resourcegroup")
+            if self.getParam("ibmcos_resourcegroup") != "":
+                self.printParamSummary("Resource Group", "ibmcos_resourcegroup")
         else:
             self.printSummary("Type", "None")
 
@@ -282,7 +303,13 @@ class InstallSummarizerMixin():
 
     def mongoSummary(self) -> None:
         self.printH2("MongoDb")
-        self.printParamSummary("Install Namespace", "mongodb_namespace")
+        if self.getParam("mongodb_action") == "install":
+            self.printSummary("Type", "MongoCE Operator")
+            self.printParamSummary("Install Namespace", "mongodb_namespace")
+        elif self.getParam("mongodb_action") == "byo":
+            self.printSummary("Type", "BYO (mongodb-system.yaml)")
+        else:
+            self.fatalError(f"Unexpected value for mongodb_action parameter: {self.getParam('mongodb_action')}")
 
     def kafkaSummary(self) -> None:
         if self.getParam("kafka_action_system") != "":
@@ -327,7 +354,6 @@ class InstallSummarizerMixin():
 
         # Cluster Config & Dependencies
         self.ocpSummary()
-        self.icrSummary()
         self.droSummary()
         self.slsSummary()
         self.masSummary()
@@ -341,6 +367,7 @@ class InstallSummarizerMixin():
         self.optimizerSummary()
         self.assistSummary()
         self.inspectionSummary()
+        self.aibrokerSummary()
 
         # Application Dependencies
         self.mongoSummary()