mas-cli 13.16.0__py3-none-any.whl → 13.17.2__py3-none-any.whl

mas/cli/install/argParser.py

@@ -170,7 +170,6 @@ masAdvancedArgGroup.add_argument(
     required=False,
     help="Configure MAS with a custom domain"
 )
-
 masAdvancedArgGroup.add_argument(
     "--disable-walkme",
     dest="mas_enable_walkme",
@@ -195,6 +194,15 @@ masAdvancedArgGroup.add_argument(
     help="Provide the name of the ClusterIssuer to configure MAS to issue certificates",
 )
 
+masAdvancedArgGroup.add_argument(
+    "--enable-ipv6",
+    dest="enable_ipv6",
+    required=False,
+    help="Configure MAS to run in IP version 6. Before setting this option, be sure your cluster is configured in IP version 6",
+    action="store_const",
+    const="true"
+)
+
 # DNS Configuration - IBM CIS
 # -----------------------------------------------------------------------------
 cisArgGroup = installArgParser.add_argument_group("DNS Configuration - CIS")
@@ -365,145 +373,9 @@ masAppsArgGroup.add_argument(
     help="Install plan for Maximo Optimizer"
 )
 masAppsArgGroup.add_argument(
-    "--aibroker-channel",
-    required=False,
-    help="Subscription channel for Maximo Ai Broker"
-)
-
-# AI Broker
-# -----------------------------------------------------------------------------
-aibrokerArgGroup = installArgParser.add_argument_group("Maximo AI Broker")
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-provider",
-    dest="mas_aibroker_storage_provider",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-accesskey",
-    dest="mas_aibroker_storage_accesskey",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-secretkey",
-    dest="mas_aibroker_storage_secretkey",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-host",
-    dest="mas_aibroker_storage_host",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-port",
-    dest="mas_aibroker_storage_port",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-ssl",
-    dest="mas_aibroker_storage_ssl",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-region",
-    dest="mas_aibroker_storage_region",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-pipelines-bucket",
-    dest="mas_aibroker_storage_pipelines_bucket",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-tenants-bucket",
-    dest="mas_aibroker_storage_tenants_bucket",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-storage-templates-bucket",
-    dest="mas_aibroker_storage_templates_bucket",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-tenant-name",
-    dest="mas_aibroker_tenant_name",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-watsonxai-apikey",
-    dest="mas_aibroker_watsonxai_apikey",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-watsonxai-url",
-    dest="mas_aibroker_watsonxai_url",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-watsonxai-project-id",
-    dest="mas_aibroker_watsonxai_project_id",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-watsonx-action",
-    dest="mas_aibroker_watsonx_action",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-host",
-    dest="mas_aibroker_db_host",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-port",
-    dest="mas_aibroker_db_port",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-user",
-    dest="mas_aibroker_db_user",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-database",
-    dest="mas_aibroker_db_database",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-secret-name",
-    dest="mas_aibroker_db_secret_name",
-    required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-secret-key",
-    dest="mas_aibroker_db_secret_key",
+    "--facilities-channel",
     required=False,
-    help="Customize Manage database encryption keys"
-)
-aibrokerArgGroup.add_argument(
-    "--mas-aibroker-db-secret-value",
-    dest="mas_aibroker_db_secret_value",
-    required=False,
-    help="Customize Manage database encryption keys"
+    help="Subscription channel for Maximo Real Estate and Facilities"
 )
 
 # Arcgis
@@ -684,7 +556,8 @@ manageArgGroup.add_argument(
     "--manage-attachments-provider",
     dest="mas_manage_attachments_provider",
     required=False,
-    help="Defines the storage provider type to be used to store attachments in Maximo Manage"
+    help="Defines the storage provider type to be used to store attachments in Maximo Manage. Supported options are `filestorage`, `ibm` and `aws`.",
+    choices=["filestorage", "ibm", "aws"]
 )
 manageArgGroup.add_argument(
     "--manage-attachments-mode",
@@ -694,6 +567,93 @@ manageArgGroup.add_argument(
     choices=["cr", "db"]
 )
 
+# Facilities Advanced Settings
+# TODO: Fix type for storage sizes and max conn pool size
+facilitiesArgGroup = installArgParser.add_argument_group("Facilities Advanced Configuration")
+facilitiesArgGroup.add_argument(
+    "--facilities-size",
+    dest="mas_ws_facilities_size",
+    required=False,
+    help="Defines the size of Facilities deployment",
+    choices=['small', 'medium', 'large'],
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-pull-policy",
+    dest="mas_ws_facilities_pull_policy",
+    required=False,
+    help="Defines the pull policy for the images",
+    choices=["IfNotPresent", "Always"],
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-routes-timeout",
+    dest="mas_ws_facilities_routes_timeout",
+    required=False,
+    help="Defines the timeout for the routes",
+    default="600s",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-xml-extension",
+    dest="mas_ws_facilities_liberty_extension_XML",
+    required=False,
+    help="Defines the name of the secret that holds the extensions for Liberty server",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-vault-secret",
+    dest="mas_ws_facilities_vault_secret",
+    required=False,
+    help="Defines the name of the secret that holds the AES Encryption password",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-dwfagent",
+    dest="mas_ws_facilities_dwfagents",
+    required=False,
+    help="Defines the list of dedicates workflow agents",
+    type=str
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-maxconnpoolsize",
+    dest="mas_ws_facilities_db_maxconnpoolsize",
+    required=False,
+    help="Defines the maximum connection pool size",
+    default=200,
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-log-storage-class",
+    dest="mas_ws_facilities_storage_log_class",
+    required=False,
+    help="Defines the log storage class",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-log-storage-mode",
+    dest="mas_ws_facilities_storage_log_mode",
+    required=False,
+    help="Defines the log storage mode",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-log-storage-size",
+    dest="mas_ws_facilities_storage_log_size",
+    required=False,
+    help="Defines the logs storage size",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-userfiles-storage-class",
+    dest="mas_ws_facilities_storage_userfiles_class",
+    required=False,
+    help="Defines the user files storage class",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-userfiles-storage-mode",
+    dest="mas_ws_facilities_storage_userfiles_mode",
+    required=False,
+    help="Defines the user files storage mode",
+)
+facilitiesArgGroup.add_argument(
+    "--facilities-userfiles-storage-size",
+    dest="mas_ws_facilities_storage_userfiles_size",
+    required=False,
+    help="Defines the user files storage size",
+)
+
 # IBM Cloud Pak for Data
 # -----------------------------------------------------------------------------
 cpdAppsArgGroup = installArgParser.add_argument_group("IBM Cloud Pak for Data")
@@ -773,6 +733,14 @@ db2ArgGroup.add_argument(
     action="store_const",
     const="install"
 )
+db2ArgGroup.add_argument(
+    "--db2-facilities",
+    dest="db2_action_facilities",
+    required=False,
+    help="Install a dedicated Db2u instance for Maximo Real Estate and Facilities (supported by Facilities)",
+    action="store_const",
+    const="install"
+)
 db2ArgGroup.add_argument(
     "--db2-type",
     required=False,
@@ -950,16 +918,19 @@ mskArgGroup.add_argument(
 eventstreamsArgGroup = installArgParser.add_argument_group("Kafka - Event Streams")
 eventstreamsArgGroup.add_argument(
     "--eventstreams-resource-group",
+    dest="eventstreams_resourcegroup",
     required=False,
     help="Set IBM Cloud resource group to target the Event Streams instance provisioning"
 )
 eventstreamsArgGroup.add_argument(
     "--eventstreams-instance-name",
+    dest="eventstreams_name",
     required=False,
     help="Set IBM Event Streams instance name"
 )
 eventstreamsArgGroup.add_argument(
     "--eventstreams-instance-location",
+    dest="eventstreams_location",
     required=False,
     help="Set IBM Event Streams instance location"
 )
@@ -1119,6 +1090,11 @@ approvalsGroup.add_argument(
     default="",
     help="Require approval after the Maximo Visual Inspection workspace has been configured"
 )
+approvalsGroup.add_argument(
+    "--approval-facilities",
+    default="",
+    help="Require approval after the Maximo Real Estate and Facilities workspace has been configured"
+)
 
 
 # More Options

mas/cli/install/catalogs.py

@@ -9,15 +9,18 @@
 # *****************************************************************************
 supportedCatalogs = {
     "amd64": [
+        "v9-250624-amd64",
+        "v9-250501-amd64",
         "v9-250403-amd64",
         "v9-250306-amd64",
-        "v9-250206-amd64",
-        "v9-250109-amd64",
     ],
     "s390x": [
+        "v9-250624-s390x",
+        "v9-250501-s390x",
         "v9-250403-s390x",
         "v9-250306-s390x",
-        "v9-250206-s390x",
-        "v9-250109-s390x",
+    ],
+    "ppc64le": [
+        "v9-250624-ppc64le",
     ],
 }

mas/cli/install/params.py

@@ -61,6 +61,8 @@ optionalParams = [
     "mas_appws_components",
     "mas_appws_bindings_health_wsl_flag",
     "mas_domain",
+    # IPV6
+    "enable_ipv6",
     # SLS
     "sls_namespace",
     # DNS Providers
@@ -76,6 +78,7 @@ optionalParams = [
     # Db2
     "db2_action_system",
     "db2_action_manage",
+    "db2_action_facilities",
     "db2_type",
     "db2_timezone",
     "db2_namespace",
@@ -112,9 +115,9 @@ optionalParams = [
     "aws_msk_cidr_az3",
     "aws_msk_egress_cidr",
     "aws_msk_ingress_cidr",
-    "eventstreams_resource_group",
-    "eventstreams_instance_name",
-    "eventstreams_instance_location",
+    "eventstreams_resourcegroup",
+    "eventstreams_name",
+    "eventstreams_location",
     # COS
     "cos_type",
     "cos_resourcegroup",
@@ -173,6 +176,20 @@ optionalParams = [
     "mas_aibroker_db_secret_name",
     "mas_aibroker_db_secret_key",
     "mas_aibroker_db_secret_value",
+    # Facilities
+    "mas_ws_facilities_size",
+    "mas_ws_facilities_routes_timeout",
+    "mas_ws_facilities_liberty_extension_XML",
+    "mas_ws_facilities_vault_secret",
+    "mas_ws_facilities_pull_policy",
+    "mas_ws_facilities_storage_log_class",
+    "mas_ws_facilities_storage_log_mode",
+    "mas_ws_facilities_storage_log_size",
+    "mas_ws_facilities_storage_userfiles_class",
+    "mas_ws_facilities_storage_userfiles_mode",
+    "mas_ws_facilities_storage_userfiles_size",
+    "mas_ws_facilities_dwfagents",
+    "mas_ws_facilities_db_maxconnpoolsize",
     # Special chars
     "mas_special_characters"
 ]

mas/cli/install/settings/additionalConfigs.py

@@ -163,6 +163,10 @@ class AdditionalConfigsMixin():
                 "mas_app_channel_optimizer": {
                     "dir": self.manualCertsDir + "/optimizer/",
                     "keyPrefix": "optimizer."
+                },
+                "mas_app_channel_facilities": {
+                    "dir": self.manualCertsDir + "/facilities/",
+                    "keyPrefix": "facilities."
                 }
             }
 

mas/cli/install/settings/db2Settings.py

@@ -13,23 +13,28 @@ from prompt_toolkit import print_formatted_text
 
 
 class Db2SettingsMixin():
-    def configDb2(self) -> None:
-        self.printH1("Configure Databases")
+    # In silentMode, no prompts will show up for "happy path" DB2 configuration scenarios. Prompts will still show up when an input is absolutely required
+    # Settings under showAdvancedOptions are always prompted
+    def configDb2(self, silentMode=False) -> None:
+        if not silentMode:
+            self.printH1("Configure Databases")
         # 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:
+        # If neither Iot, Manage or Facilities is being installed, we have nothing to do
+        if not self.installIoT and not self.installManage and not self.installFacilities:
             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")
+            self.setParam("db2_action_facilities", "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:
+        # For now we are limiting users to bring your own database for Manage on s390x & ppc64le
+        # Eventually we will be able to remove this clause and allow the standard logic to work for s390x, ppc64le and amd64
+        if (self.architecture == "s390x" or self.architecture == "ppc64le") and self.installManage:
+            # silentMode does not apply for s390x/ppc64le because it requires interaction when selecting local config directory
             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.",
+                "Installation of a Db2 instance using the IBM Db2 Universal Operator is not currently supported on s390x /ppc64le, please provide configuration details for the database you wish to use.",
             ])
             instanceId = self.getParam('mas_instance_id')
             workspaceId = self.getParam("mas_workspace_id")
@@ -50,22 +55,27 @@ class Db2SettingsMixin():
             return
 
         # Proceed as normal
-        # We know we are installing either IoT or Manage, and on amd64 target architecture
-        self.printDescription([
-            f"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, {self.manageAppName}, Monitor, & Predict) or you may choose to configure MAS to use an existing database"
-        ])
+        # We know we are installing either IoT, Manage or Facilities, and on amd64 target architecture
+        if not silentMode:
+            self.printDescription([
+                f"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, {self.manageAppName}, Monitor, & Predict, Real Estate and Facilities) or you may choose to configure MAS to use an existing database"
+            ])
 
         self.setDB2DefaultSettings()
 
         instanceId = self.getParam('mas_instance_id')
         # Do we need to set up an IoT database?
         if self.installIoT:
-            self.printH2("Database Configuration for Maximo IoT")
-            self.printDescription([
-                "Maximo IoT requires a shared system-scope Db2 instance because others application in the suite require access to the same database source",
-                " - Only IBM Db2 is supported for this database"
-            ])
-            if self.yesOrNo("Create system Db2 instance using the IBM Db2 Universal Operator"):
+            if not silentMode:
+                self.printH2("Database Configuration for Maximo IoT")
+                self.printDescription([
+                    "Maximo IoT requires a shared system-scope Db2 instance because others application in the suite require access to the same database source",
+                    " - Only IBM Db2 is supported for this database"
+                ])
+            createSystemDb2UsingUniversalOperator = True
+            if not silentMode:
+                createSystemDb2UsingUniversalOperator = self.yesOrNo("Create system Db2 instance using the IBM Db2 Universal Operator")
+            if createSystemDb2UsingUniversalOperator:
                 self.setParam("db2_action_system", "install")
             else:
                 self.setParam("db2_action_system", "byo")
@@ -85,28 +95,39 @@ class Db2SettingsMixin():
             self.setParam("db2_action_system", "none")
 
         if self.installManage:
-            self.printH2(f"Database Configuration for Maximo {self.manageAppName}")
-            self.printDescription([
-                f"Maximo {self.manageAppName} can be configured to share the system Db2 instance or use it's own dedicated database:",
-                " - Use of a shared instance has a significant footprint reduction but is only recommended for development/test/demo installs",
-                " - In most production systems you will want to use a dedicated database",
-                " - IBM Db2, Oracle Database, & Microsoft SQL Server are all supported database options"
-            ])
+            if not silentMode:
+                self.printH2(f"Database Configuration for Maximo {self.manageAppName}")
+                self.printDescription([
+                    f"Maximo {self.manageAppName} can be configured to share the system Db2 instance or use it's own dedicated database:",
+                    " - Use of a shared instance has a significant footprint reduction but is only recommended for development/test/demo installs",
+                    " - In most production systems you will want to use a dedicated database",
+                    " - IBM Db2, Oracle Database, & Microsoft SQL Server are all supported database options"
+                ])
             # Determine whether to use the system or a dedicated database
-            if self.installIoT and self.yesOrNo(f"Re-use System Db2 instance for {self.manageAppName} application"):
+            reuseSystemDb2 = False
+            if self.installIoT:
+                if not silentMode:
+                    reuseSystemDb2 = self.yesOrNo(f"Re-use System Db2 instance for {self.manageAppName} application")
+            if reuseSystemDb2:
                 # We are going to bind Manage to the system database, which has already been set up in the previous step
                 self.setParam("mas_appws_bindings_jdbc_manage", "system")
                 self.setParam("db2_action_manage", "none")
             else:
                 self.setParam("mas_appws_bindings_jdbc_manage", "workspace-application")
-                if self.yesOrNo(f"Create {self.manageAppName} dedicated Db2 instance using the IBM Db2 Universal Operator"):
+                createSystemDb2UsingUniversalOperator = True
+                if not silentMode:
+                    createSystemDb2UsingUniversalOperator = self.yesOrNo(f"Create {self.manageAppName} dedicated Db2 instance using the IBM Db2 Universal Operator")
+                if createSystemDb2UsingUniversalOperator:
                     self.setParam("db2_action_manage", "install")
-                    self.printDescription([
-                        f"Available Db2 instance types for {self.manageAppName}:",
-                        "  1. DB2 Warehouse (Default option)",
-                        "  2. DB2 Online Transactional Processing (OLTP)"
-                    ])
-                    self.promptForListSelect(message=f"Select the {self.manageAppName} dedicated DB2 instance type", options=["db2wh", "db2oltp"], param="db2_type", default="1")
+                    if not silentMode:
+                        self.printDescription([
+                            f"Available Db2 instance types for {self.manageAppName}:",
+                            "  1. DB2 Warehouse (Default option)",
+                            "  2. DB2 Online Transactional Processing (OLTP)"
+                        ])
+                        self.promptForListSelect(message=f"Select the {self.manageAppName} dedicated DB2 instance type", options=["db2wh", "db2oltp"], param="db2_type", default="1")
+                    else:
+                        self.setParam("db2_type", "db2wh")
                 else:
                     workspaceId = self.getParam("mas_workspace_id")
                     self.setParam("db2_action_manage", "byo")
@@ -125,8 +146,31 @@ class Db2SettingsMixin():
         else:
             self.setParam("db2_action_manage", "none")
 
+        # Do we need to create and configure a Db2 for Facilities ?
+        if self.installFacilities:
+            self.printH2("Database Configuration for Maximo Real Estate and Facilities")
+            if self.yesOrNo("Create Real Estate and Facilities dedicated Db2 instance using the IBM Db2 Universal Operator"):
+                self.setParam("db2_action_facilities", "install")
+            else:
+                self.setParam("db2_action_facilities", "none")
+                instanceId = self.getParam('mas_instance_id')
+                workspaceId = self.getParam("mas_workspace_id")
+                self.selectLocalConfigDir()
+
+                # Check if a configuration already exists before creating a new one
+                jdbcCfgFile = path.join(self.localConfigDir, f"jdbc-{instanceId}-facilities.yaml")
+                print_formatted_text(f"Searching for Real Estate and Facilities database configuration file in {jdbcCfgFile} ...")
+                if path.exists(jdbcCfgFile):
+                    if self.yesOrNo(f"Real Estate and Facilities database configuration file 'jdbc-{instanceId}-facilities.yaml' already exists.  Do you want to generate a new one"):
+                        self.generateJDBCCfg(instanceId=instanceId, scope="workspace-application", workspaceId=workspaceId, appId="facilities", destination=jdbcCfgFile)
+                else:
+                    print_formatted_text(f"Expected file ({jdbcCfgFile}) was not found, generating a valid Real Estate and Facilities database configuration file now ...")
+                    self.generateJDBCCfg(instanceId=instanceId, scope="workspace-application", workspaceId=workspaceId, appId="facilities", destination=jdbcCfgFile)
+        else:
+            self.setParam("db2_action_facilities", "none")
+
         # Do we need to configure Db2u?
-        if self.getParam("db2_action_system") == "install" or self.getParam("db2_action_manage") == "install":
+        if self.getParam("db2_action_system") == "install" or self.getParam("db2_action_manage") == "install" or self.getParam("db2_action_facilities") == "install":
             if self.showAdvancedOptions:
                 self.printH2("Installation Namespace")
                 self.promptForString("Install namespace", "db2_namespace", default="db2u")
@@ -138,8 +182,10 @@ class Db2SettingsMixin():
                     f"Note that the same settings are applied to both the IoT and {self.manageAppName} 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:",
-                    " - <Orange><u>https://docs.openshift.com/container-platform/4.16/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
-                    " - <Orange><u>https://docs.openshift.com/container-platform/4.16/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>"
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.18/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.18/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.17/nodes/scheduling/nodes-scheduler-node-affinity.html</u></Orange>",
+                    " - <Orange><u>https://docs.openshift.com/container-platform/4.17/nodes/scheduling/nodes-scheduler-taints-tolerations.html</u></Orange>"
                 ])
 
                 if self.yesOrNo("Configure node affinity"):

mas/cli/install/settings/manageSettings.py

@@ -63,13 +63,13 @@ class ManageSettingsMixin():
             storageClass = self.getParam("storage_class_rwo")
             accessMode = "ReadWriteOnce"
 
-            self.setParam("mas_app_settings_doclinks_pvc_storage_class", storageClass)
-            self.setParam("mas_app_settings_bim_pvc_storage_class", storageClass)
-            self.setParam("mas_app_settings_jms_queue_pvc_storage_class", storageClass)
+        self.setParam("mas_app_settings_doclinks_pvc_storage_class", storageClass)
+        self.setParam("mas_app_settings_bim_pvc_storage_class", storageClass)
+        self.setParam("mas_app_settings_jms_queue_pvc_storage_class", storageClass)
 
-            self.setParam("mas_app_settings_doclinks_pvc_accessmode", accessMode)
-            self.setParam("mas_app_settings_bim_pvc_accessmode", accessMode)
-            self.setParam("mas_app_settings_jms_queue_pvc_accessmode", accessMode)
+        self.setParam("mas_app_settings_doclinks_pvc_accessmode", accessMode)
+        self.setParam("mas_app_settings_bim_pvc_accessmode", accessMode)
+        self.setParam("mas_app_settings_jms_queue_pvc_accessmode", accessMode)
 
     def manageSettingsComponents(self) -> None:
         # Only ask to install Manage components if this is a full Manage installation
@@ -119,6 +119,8 @@ class ManageSettingsMixin():
                     self.params["mas_appws_components"] += ",utilities=latest"
                 if self.yesOrNo(" - Workday Applications"):
                     self.params["mas_appws_components"] += ",workday=latest"
+                if self.yesOrNo(" - AIP"):
+                    self.params["mas_appws_components"] += ",aip=latest"
                 logger.debug(f"Generated mas_appws_components = {self.params['mas_appws_components']}")
 
                 if ",icd=" in self.params["mas_appws_components"]:
@@ -207,7 +209,7 @@ class ManageSettingsMixin():
                 self.promptForString("Customization archive path/url", "mas_app_settings_customization_archive_url")
                 if self.yesOrNo("Provide authentication to access customization archive URL"):
                     self.promptForString("Username", "mas_app_settings_customization_archive_username")
-                    self.promptForString("Password", "mas_app_settings_customization_archive_password", isPassword=True)
+                    self.promptForString("Password", "mas_app_settings_customization_archive_password", isPassword=True)  # pragma: allowlist secret
 
     def manageSettingsDemodata(self) -> None:
         self.yesOrNo("Create demo data", "mas_app_settings_demodata")
@@ -269,29 +271,3 @@ 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

@@ -19,7 +19,7 @@ class MongoDbSettingsMixin():
             "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.architecture != "s390x" and self.architecture != "ppc64le") and self.yesOrNo("Create MongoDb cluster using MongoDb Community Edition Operator"):
             if self.showAdvancedOptions:
                 self.promptForString("MongoDb namespace", "mongodb_namespace", default="mongoce")
             else: