mas-cli 10.8.0__py3-none-any.whl → 10.9.1__py3-none-any.whl

mas/cli/install/argBuilder.py

@@ -0,0 +1,367 @@
+# *****************************************************************************
+# 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
+#
+# *****************************************************************************
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+class installArgBuilderMixin():
+    def buildCommand(self) -> str:
+        # MAS Catalog Selection & Entitlement
+        # -----------------------------------------------------------------------------
+        newline = " \\\n"
+        command = "export IBM_ENTITLEMENT_KEY=x\n"
+        if self.getParam('ibmcloud_apikey') != "":
+            command += "export IBMCLOUD_APIKEY=x\n"
+        if self.getParam('aws_access_key_id') != "":
+            command += "export AWS_ACCESS_KEY_ID=x\n"
+        if self.getParam('secret_access_key') != "":
+            command += "export SECRET_ACCESS_KEY=x\n"
+        if self.getParam('artifactory_username') != "":
+            command += "export ARTIFACTORY_USERNAME=x\nexport ARTIFACTORY_TOKEN=x\n"
+
+        if self.getParam('mas_superuser_password') != "":
+            command += "export SUPERUSER_PASSWORD=x\n"
+
+        if self.getParam('eck_remote_es_password') != "":
+            command += "export ES_PASSWORD=x\n"
+        if self.getParam('kafka_password') != "":
+            command += "export KAFKA_PASSWORD=x\n"
+
+        if self.getParam('mas_app_settings_customization_archive_password') != "":
+            command += "export CUSTOMIZATION_PASSWORD=x\n"
+        if self.getParam('mas_app_settings_crypto_key') != "":
+            command += "export CRYPTO_KEY=x\n"
+        if self.getParam('mas_app_settings_cryptox_key') != "":
+            command += "export CRYPTOX_KEY=x\n"
+        if self.getParam('mas_app_settings_old_crypto_key') != "":
+            command += "export OLD_CRYPTO_KEY=x\n"
+        if self.getParam('mas_app_settings_old_cryptox_key') != "":
+            command += "export OLD_CRYTPOX_KEY=x\n"
+
+        command += f"mas install --mas-catalog-version {self.getParam('mas_catalog_version')}"
+
+        if self.getParam('mas_catalog_digest') != "":
+            command += f" --mas-catalog-digest {self.getParam('mas_catalog_digest')}"
+
+        command += f" --ibm-entitlement-key $IBM_ENTITLEMENT_KEY{newline}"
+
+        # MAS Basic Configuration
+        # -----------------------------------------------------------------------------
+        command += f"  --mas-channel {self.getParam('mas_channel')}"
+        command += f" --mas-instance-id {self.getParam('mas_instance_id')}"
+        command += f" --mas-workspace-id {self.getParam('mas_workspace_id')}"
+        command += f" --mas-workspace-name \"{self.getParam('mas_workspace_name')}\"{newline}"
+
+        # ECK Integration
+        # -----------------------------------------------------------------------------
+        if self.getParam('eck_action') == "install":
+            command += "--eck"
+        if self.getParam('eck_enable_logstash') == "true":
+            command += f"--eck-enable-logstash{newline}"
+        if self.getParam('eck_remote_es_hosts') != "":
+            command += f"--eck-remote-es-hosts \"{self.getParam('eck_remote_es_hosts')}\"{newline}"
+        if self.getParam('eck_remote_es_username') != "":
+            command += f"--eck-remote-es-username \"{self.getParam('eck_remote_es_username')}\""
+        if self.getParam('eck_remote_es_password') != "":
+            command += f"--eck-remote-es-password $ES_PASSWORD{newline}"
+
+        # MAS Advanced Configuration
+        # -----------------------------------------------------------------------------
+        if self.getParam('mas_superuser_username') != "":
+            command += f"  --mas-superuser-username \"{self.getParam('mas_superuser_username')}\""
+        if self.getParam('mas_superuser_password') != "":
+            command += f" --mas-superuser-password $SUPERUSER_PASSWORD{newline}"
+
+        if self.localConfigDir is not None:
+            command += f"  --additional-configs \"{self.localConfigDir}\"{newline}"
+        if self.getParam('pod_templates') != "":
+            command += f"  --pod-templates \"{self.getParam('pod_templates')}\"{newline}"
+
+        if self.operationalMode == 2:
+            command += f"  --non-prod{newline}"
+
+        if self.getParam('mas_trust_default_cas') == "false":
+            command += f"  --disable-ca-trust{newline}"
+
+        if self.getParam('mas_manual_cert_mgmt') == True:
+            command += f"  --manual-certificates \"{self.getParam('mas_manual_cert_dir')}\"{newline}"
+
+        if self.getParam('mas_enable_walkme') == "false":
+            command += f"  --disable-walkme{newline}"
+
+        # Storage
+        # -----------------------------------------------------------------------------
+        command += f"  --storage-class-rwo \"{self.getParam('storage_class_rwo')}\""
+        command += f" --storage-class-rwx \"{self.getParam('storage_class_rwx')}\"{newline}"
+        command += f"  --storage-pipeline \"{self.pipelineStorageClass}\""
+        command += f" --storage-accessmode \"{self.pipelineStorageAccessMode}\"{newline}"
+
+        # IBM Suite License Service
+        # -----------------------------------------------------------------------------
+        command += f"  --license-file \"{self.slsLicenseFileLocal}\"{newline}"
+
+        # IBM Data Reporting Operator (DRO)
+        # -----------------------------------------------------------------------------
+        command += f"  --uds-email \"{self.getParam('uds_contact_email')}\""
+        command += f" --uds-firstname \"{self.getParam('uds_contact_firstname')}\""
+        command += f" --uds-lastname \"{self.getParam('uds_contact_lastname')}\"{newline}"
+        if self.getParam('dro_namespace') != "":
+            command += f"  --dro-namespace \"{self.getParam('dro_namespace')}\"{newline}"
+
+        # MongoDb Community Operator
+        # -----------------------------------------------------------------------------
+        if self.getParam('mongodb_namespace') != "":
+            command += f"  --mongodb-namespace \"{self.getParam('mongodb_namespace')}\"{newline}"
+
+        # OCP Configuration
+        # -----------------------------------------------------------------------------
+        if self.getParam('ocp_ingress_tls_secret_name') != "":
+            command += f"  --ocp-ingress-tls-secret-name \"{self.getParam('ocp_ingress_tls_secret_name')}\"{newline}"
+
+        # MAS Applications
+        # -----------------------------------------------------------------------------
+        if self.installAssist:
+            command += f"  --assist-channel \"{self.getParam('mas_app_channel_assist')}\"{newline}"
+        if self.installIoT:
+            command += f"  --iot-channel \"{self.getParam('mas_app_channel_iot')}\"{newline}"
+        if self.installMonitor:
+            command += f"  --monitor-channel \"{self.getParam('mas_app_channel_monitor')}\"{newline}"
+        if self.installManage:
+            command += f"  --manage-channel \"{self.getParam('mas_app_channel_manage')}\"{newline}"
+        if self.installOptimizer:
+            command += f"  --optimizer-channel \"{self.getParam('mas_app_channel_optimizer')}\""
+            command += f" --optimizer-plan \"{self.getParam('mas_app_plan_optimizer')}\"{newline}"
+        if self.installPredict:
+            command += f"  --predict-channel \"{self.getParam('mas_app_channel_predict')}\"{newline}"
+        if self.installInspection:
+            command += f"  --visualinspection-channel \"{self.getParam('mas_app_channel_visualinspection')}\"{newline}"
+
+        # Arcgis
+        # -----------------------------------------------------------------------------
+        # TODO: Add ArcGis after we have properly fixed how it's installed
+
+        # Manage Advanced Settings
+        # -----------------------------------------------------------------------------
+        if self.installManage:
+            command += f"  --manage-jdbc \"{self.getParam('mas_appws_bindings_jdbc_manage')}\"{newline}"
+            command += f"  --manage-components \"{self.getParam('mas_appws_components')}\"{newline}"
+
+            if self.getParam('mas_app_settings_server_bundles_size') != "":
+                command += f"  --manage-server-bundle-size \"{self.getParam('mas_app_settings_server_bundles_size')}\"{newline}"
+            if self.getParam('mas_app_settings_default_jms') != "":
+                command += f"  --manage-jms \"{self.getParam('mas_app_settings_default_jms')}\"{newline}"
+            if self.getParam('mas_app_settings_persistent_volumes_flag') == "true":
+                command += f"  --manage-persistent-volumes{newline}"
+            if self.getParam('mas_app_settings_demodata') == "true":
+                command += f"  --manage-demodata{newline}"
+
+            if self.getParam('mas_app_settings_customization_archive_name') != "":
+                command += f"  --manage-customization-archive-name \"{self.getParam('mas_app_settings_customization_archive_name')}\"{newline}"
+            if self.getParam('mas_app_settings_customization_archive_url') != "":
+                command += f"  --manage-customization-archive-url \"{self.getParam('mas_app_settings_customization_archive_url')}\"{newline}"
+            if self.getParam('mas_app_settings_customization_archive_username') != "":
+                command += f"  --manage-customization-archive-username \"{self.getParam('mas_app_settings_customization_archive_username')}\"{newline}"
+            if self.getParam('mas_app_settings_customization_archive_password') != "":
+                command += f"  --manage-customization-archive-password $CUSTOMIZATION_PASSWORD{newline}"
+
+            if self.getParam('mas_app_settings_tablespace') != "":
+                command += f"  --manage-db-tablespace \"{self.getParam('mas_app_settings_tablespace')}\"{newline}"
+            if self.getParam('mas_app_settings_indexspace') != "":
+                command += f"  --manage-db-indexspace \"{self.getParam('mas_app_settings_indexspace')}\"{newline}"
+            if self.getParam('mas_app_settings_db2_schema') != "":
+                command += f"  --manage-db-schema \"{self.getParam('mas_app_settings_db2_schema')}\"{newline}"
+
+            if self.getParam('mas_app_settings_crypto_key') != "":
+                command += f"  --manage-crypto-key $CRYPTO_KEY{newline}"
+            if self.getParam('mas_app_settings_cryptox_key') != "":
+                command += f"  --manage-cryptox-key $CRYPTOX_KEY{newline}"
+            if self.getParam('mas_app_settings_old_crypto_key') != "":
+                command += f"  --manage-old-crypto-key $OLD_CRYPTO_KEY{newline}"
+            if self.getParam('mas_app_settings_old_cryptox_key') != "":
+                command += f"  --manage-old-cryptox-key $OLD_CRYPTOX_KEY{newline}"
+            if self.getParam('mas_app_settings_override_encryption_secrets_flag') == "true":
+                command += f"  --manage-override-encryption-secrets \"{newline}"
+
+            if self.getParam('mas_app_settings_base_lang') != "":
+                command += f"  --manage-base-language \"{self.getParam('mas_app_settings_base_lang')}\"{newline}"
+            if self.getParam('mas_app_settings_secondary_langs') != "":
+                command += f"  --manage-secondary-languages \"{self.getParam('mas_app_settings_secondary_langs')}\"{newline}"
+
+            if self.getParam('mas_app_settings_server_timezone') != "":
+                command += f"  --manage-server-timezone \"{self.getParam('mas_app_settings_server_timezone')}\"{newline}"
+
+            # IBM Cloud Pak for Data
+            # -----------------------------------------------------------------------------
+            if self.getParam('cpd_product_version') != "":
+                command += f"  --cp4d-version \"{self.getParam('cpd_product_version')}\""
+                if self.getParam('cpd_install_spss') == "install":
+                    command += f" --cp4d-install-spss"
+                if self.getParam('cpd_install_openscale') == "install":
+                    command += f" --cp4d-install-openscal"
+                if self.getParam('cpd_install_cognos') == "install":
+                    command += f" --cp4d-install-cognos"
+                command += newline
+
+            # IBM Db2 Universal Operator
+            # -----------------------------------------------------------------------------
+            if self.getParam('db2_system') == "install" or self.getParam('db2_manage') == "install":
+                if self.getParam('db2_system') == "install":
+                    command += f"  --db2-system{newline}"
+                if self.getParam('db2_manage') == "install":
+                    command += f"  --db2-manage{newline}"
+
+                if self.getParam('db2_channel') != "":
+                    command += f"  --db2-channel \"{self.getParam('db2_channel')}\"{newline}"
+                if self.getParam('db2_namespace') != "":
+                    command += f"  --db2-namespace \"{self.getParam('db2_namespace')}\"{newline}"
+
+                if self.getParam('db2_type') != "":
+                    command += f"  --db2-type \"{self.getParam('db2_type')}\"{newline}"
+                if self.getParam('db2_timezone') != "":
+                    command += f"  --db2-timezone \"{self.getParam('db2_timezone')}\"{newline}"
+
+                if self.getParam('db2_affinity_key') != "":
+                    command += f"  --db2-affinity-key \"{self.getParam('db2_affinity_key')}\"{newline}"
+                if self.getParam('db2_affinity_value') != "":
+                    command += f"  --db2-affinity_value \"{self.getParam('db2_affinity_value')}\"{newline}"
+
+                if self.getParam('db2_tolerate_key') != "":
+                    command += f"  --db2-tolerate-key \"{self.getParam('db2_tolerate_key')}\"{newline}"
+                if self.getParam('db2_tolerate_value') != "":
+                    command += f"  --db2-tolerate-value \"{self.getParam('db2_tolerate_value')}\"{newline}"
+                if self.getParam('db2_tolerate_effect') != "":
+                    command += f"  --db2-tolerate-effect \"{self.getParam('db2_tolerate_effect')}\"{newline}"
+
+                if self.getParam('db2_cpu_requests') != "":
+                    command += f"  --db2-cpu-requests \"{self.getParam('db2_cpu_requests')}\"{newline}"
+                if self.getParam('db2_cpu_limits') != "":
+                    command += f"  --db2-cpu-limits \"{self.getParam('db2_cpu_limits')}\"{newline}"
+
+                if self.getParam('db2_memory_requests') != "":
+                    command += f"  --db2-memory-requests \"{self.getParam('db2_memory_requests')}\"{newline}"
+                if self.getParam('db2_memory_limits') != "":
+                    command += f"  --db2-memory-limits \"{self.getParam('db2_memory_limits')}\"{newline}"
+
+                if self.getParam('db2_backup_storage_size') != "":
+                    command += f"  --db2-backup-storage \"{self.getParam('db2_backup_storage_size')}\"{newline}"
+                if self.getParam('db2_data_storage_size') != "":
+                    command += f"  --db2-data-storage \"{self.getParam('db2_data_storage_size')}\"{newline}"
+                if self.getParam('db2_logs_storage_size') != "":
+                    command += f"  --db2-logs-storage \"{self.getParam('db2_logs_storage_size')}\"{newline}"
+                if self.getParam('db2_meta_storage_size') != "":
+                    command += f"  --db2-meta-storage \"{self.getParam('db2_meta_storage_size')}\"{newline}"
+                if self.getParam('db2_temp_storage_size') != "":
+                    command += f"  --db2-temp-storage \"{self.getParam('db2_temp_storage_size')}\"{newline}"
+
+            # Kafka - Common
+            # -----------------------------------------------------------------------------
+            if self.getParam('kafka_provider') != "":
+                command += f"  --kafka-provider \"{self.getParam('kafka_provider')}\"{newline}"
+
+                if self.getParam('kafka_username') != "":
+                    command += f"  --kafka-username \"{self.getParam('kafka_username')}\"{newline}"
+                if self.getParam('kafka_password') != "":
+                    command += f"  --kafka-password $KAFKA_PASSWORD{newline}"
+
+                # Kafka - Strimzi & AMQ Streams
+                # -----------------------------------------------------------------------------
+                if self.getParam('kafka_namespace') != "":
+                    command += f"  --kafka-namespace \"{self.getParam('kafka_namespace')}\"{newline}"
+                if self.getParam('kafka_version') != "":
+                    command += f"  --kafka-version \"{self.getParam('kafka_version')}\"{newline}"
+
+                # Kafka - MSK
+                # -----------------------------------------------------------------------------
+                if self.getParam('aws_msk_instance_type') != "":
+                    command += f"  --msk-instance-type \"{self.getParam('aws_msk_instance_type')}\""
+                    command += f" --msk-instance-nodes \"{self.getParam('aws_msk_instance_nodes')}\""
+                    command += f" --msk-instance-volume-size \"{self.getParam('aws_msk_instance_volume_size')}\"{newline}"
+
+                    command += f"  --msk-cidr-az1 \"{self.getParam('aws_msk_cidr_az1')}\""
+                    command += f" --msk-cidr-az2 \"{self.getParam('aws_msk_cidr_az1')}\""
+                    command += f" --msk-cidr-az3 \"{self.getParam('aws_msk_cidr_az1')}\"{newline}"
+
+                    command += f"  --msk-cidr-egress \"{self.getParam('aws_msk_egress_cidr')}\""
+                    command += f" --msk-cidr-ingress \"{self.getParam('aws_msk_ingress_cidr')}\"{newline}"
+
+                # Kafka - Event Streams
+                # -----------------------------------------------------------------------------
+                if self.getParam('eventstreams_instance_name') != "":
+                    command += f"  --eventstreams-resource-group \"{self.getParam('eventstreams_resource_group')}\""
+                    command += f" --eventstreams-instance-name \"{self.getParam('eventstreams_instance_name')}\""
+                    command += f" --eventstreams-instance-location \"{self.getParam('eventstreams_instance_location')}\"{newline}"
+
+            # COS
+            # -----------------------------------------------------------------------------
+            if self.getParam('cos_type') != "":
+                command += f"  --cos \"{self.getParam('cos_type')}\""
+                if self.getParam('cos_resourcegroup') != "":
+                    command += f" --cos-resourcegroup \"{self.getParam('cos_resourcegroup')}\""
+                command += newline
+
+            # Turbonomic Integration
+            # -----------------------------------------------------------------------------
+            if self.getParam('turbonomic_target_name') != "":
+                command += f"  --turbonomic-name \"{self.getParam('turbonomic_target_name')}\""
+                command += f"  --turbonomic-url \"{self.getParam('turbonomic_server_url')}\""
+                command += f"  --turbonomic-version \"{self.getParam('turbonomic_server_version')}\""
+                command += f"  --turbonomic-username \"{self.getParam('turbonomic_username')}\""
+                command += f"  --turbonomic-password \"{self.getParam('turbonomic_password')}\"{newline}"
+
+            # Cloud Providers
+            # -----------------------------------------------------------------------------
+            if self.getParam('ibmcloud_apikey') != "":
+                command += f"  --ibmcloud-apikey $IBMCLOUD_APIKEY{newline}"
+
+            if self.getParam('aws_access_key_id') != "":
+                command += f"  --aws-access-key-id $AWS_ACCESS_KEY_ID{newline}"
+            if self.getParam('secret_access_key') != "":
+                command += f"  --secret-access-key $SECRET_ACCESS_KEY{newline}"
+                command += f"  --aws-region \"{self.getParam('aws_region')}\""
+                command += f"  --aws-vpc-id \"{self.getParam('aws_vpc_id')}\""
+
+            # Development Mode
+            # -----------------------------------------------------------------------------
+            if self.getParam('artifactory_username') != "":
+                command += f"  --artifactory-username $ARTIFACTORY_USERNAME --artifactory-token $ARTIFACTORY_TOKEN{newline}"
+
+            # Approvals
+            # -----------------------------------------------------------------------------
+            if self.getParam('approval_core') != "":
+                command += f"  --approval-core \"{self.getParam('approval_core')}\"{newline}"
+            if self.getParam('approval_assist') != "":
+                command += f"  --approval-assist \"{self.getParam('approval_assist')}\"{newline}"
+            if self.getParam('approval_iot') != "":
+                command += f"  --approval-iot \"{self.getParam('approval_iot')}\"{newline}"
+            if self.getParam('approval_manage') != "":
+                command += f"  --approval-manage \"{self.getParam('approval_manage')}\"{newline}"
+            if self.getParam('approval_monitor') != "":
+                command += f"  --approval-monitor \"{self.getParam('approval_monitor')}\"{newline}"
+            if self.getParam('approval_optimizer') != "":
+                command += f"  --approval-optimizer \"{self.getParam('approval_optimizer')}\"{newline}"
+            if self.getParam('approval_predict') != "":
+                command += f"  --approval-predict \"{self.getParam('approval_predict')}\"{newline}"
+            if self.getParam('approval_visualinspection') != "":
+                command += f"  --approval-visualinspection \"{self.getParam('approval_visualinspection')}\"{newline}"
+
+            # More Options
+            # -----------------------------------------------------------------------------
+            if self.devMode:
+                command += f"  --dev-mode{newline}"
+            if not self.waitForPVC:
+                command += f"  --no-wait-for-pvc{newline}"
+            if self.getParam('skip_pre_check') == True:
+                command += f"  --skip-pre-check{newline}"
+            if self.getParam('skip_grafana_install') == True:
+                command += f"  --skip-grafana-install{newline}"
+
+        command += "  --accept-license --no-confirm"
+        return command

mas/cli/install/argParser.py

@@ -41,6 +41,11 @@ catArgGroup.add_argument(
     required=False,
     help="IBM Maximo Operator Catalog to install"
 )
+catArgGroup.add_argument(
+    "--mas-catalog-digest",
+    required=False,
+    help="IBM Maximo Operator Catalog Digest, only required when installing development catalog sources"
+)
 catArgGroup.add_argument(
     "--ibm-entitlement-key",
     required=False,
@@ -464,7 +469,7 @@ cpdAppsArgGroup.add_argument(
     const="install"
 )
 cpdAppsArgGroup.add_argument(
-    "--cp4d-installopenscale",
+    "--cp4d-install-openscale",
     dest="cpd_install_openscale",
     required=False,
     help="Add Watson Openscale as part of Cloud Pak for Data",
@@ -595,7 +600,6 @@ db2ArgGroup.add_argument(
     help="Customize Db2 storage capacity"
 )
 
-
 # Kafka - Common
 # -----------------------------------------------------------------------------
 kafkaCommonArgGroup = installArgParser.add_argument_group("Kafka - Common")
@@ -684,23 +688,39 @@ mskArgGroup.add_argument(
 
 # Kafka - Event Streams
 # -----------------------------------------------------------------------------
-mskArgGroup = installArgParser.add_argument_group("Kafka - Event Streams")
-mskArgGroup.add_argument(
+eventstreamsArgGroup = installArgParser.add_argument_group("Kafka - Event Streams")
+eventstreamsArgGroup.add_argument(
     "--eventstreams-resource-group",
     required=False,
     help="Set IBM Cloud resource group to target the Event Streams instance provisioning"
 )
-mskArgGroup.add_argument(
+eventstreamsArgGroup.add_argument(
     "--eventstreams-instance-name",
     required=False,
     help="Set IBM Event Streams instance name"
 )
-mskArgGroup.add_argument(
+eventstreamsArgGroup.add_argument(
     "--eventstreams-instance-location",
     required=False,
     help="Set IBM Event Streams instance location"
 )
 
+# COS
+# -----------------------------------------------------------------------------
+cosArgGroup = installArgParser.add_argument_group("Cloud Object Storage")
+cosArgGroup.add_argument(
+    "--cos",
+    dest="cos_type",
+    required=False,
+    help="Set cloud object storage provider.  Supported options are `ibm` and `ocs`",
+    choices=["ibm", "ocs"]
+)
+cosArgGroup.add_argument(
+    "--cos-resourcegroup",
+    required=False,
+    help="When using IBM COS, set the resource group where the instance will run"
+)
+
 # Turbonomic Integration
 # -----------------------------------------------------------------------------
 turboArgGroup = installArgParser.add_argument_group("Turbonomic Integration")

mas/cli/install/settings/additionalConfigs.py

@@ -161,16 +161,16 @@ class AdditionalConfigsMixin():
                     },
                 "mas_app_channel_optimizer": {
                         "dir": self.getParam("mas_manual_cert_dir") + "/optimizer/",
-                        "keyPrefix": "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/')
             for ext in extensions:
                 certsSecret = self.addFilesToSecret(certsSecret, self.getParam("mas_manual_cert_dir")+'/core/', ext, "core.")
-            
+
             for app in apps:
                 if self.getParam(app) != "":
                     for file in ["ca.crt", "tls.crt", "tls.key"]:
@@ -181,7 +181,6 @@ class AdditionalConfigsMixin():
 
             self.certsSecret = certsSecret
 
-
     def addFilesToSecret(self, secretDict: dict, configPath: str, extension: str, keyPrefix: str='') -> dict:
         """
         Add file (or files) to pipeline-additional-configs

mas/cli/install/settings/manageSettings.py

@@ -52,13 +52,21 @@ class ManageSettingsMixin():
             self.manageSettingsCustomizationArchive()
             self.manageSettingsOther()
 
-            self.setParam("mas_app_settings_doclinks_pvc_storage_class", self.getParam("storage_class_rwx"))
-            self.setParam("mas_app_settings_bim_pvc_storage_class", self.getParam("storage_class_rwx"))
-            self.setParam("mas_app_settings_jms_queue_pvc_storage_class", self.getParam("storage_class_rwx"))
-
-            self.setParam("mas_app_settings_doclinks_pvc_accessmode", "ReadWriteMany")
-            self.setParam("mas_app_settings_bim_pvc_accessmode", "ReadWriteMany")
-            self.setParam("mas_app_settings_jms_queue_pvc_accessmode", "ReadWriteMany")
+            # Default to RWX storage classes, but fall back to RWO in SNO or when user
+            # has chosen not to provide a RWX storage class
+            storageClass = self.getParam("storage_class_rwx")
+            accessMode = "ReadWriteMany"
+            if self.isSNO() or self.getParam("storage_class_rwx") == "none":
+                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_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:
         self.printH2("Maximo Manage Components")
@@ -103,8 +111,8 @@ class ManageSettingsMixin():
 
         if self.yesOrNo("Customize database settings"):
             self.promptForString("Schema", "mas_app_settings_db2_schema", default="maximo")
-            self.promptForString("Tablespace", "mas_app_settings_db2_tablespace", default="MAXDATA")
-            self.promptForString("Indexspace", "mas_app_settings_db2_indexspace", default="MAXINDEX")
+            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")

mas/cli/install/settings/turbonomicSettings.py

@@ -8,6 +8,8 @@
 #
 # *****************************************************************************
 
+from mas.devops.mas import isAirgapInstall
+
 class TurbonomicSettingsMixin():
 
     def configTurbonomic(self) -> None:
@@ -17,7 +19,9 @@ class TurbonomicSettingsMixin():
             " - Learn more: <u>https://www.ibm.com/products/turbonomic</u>"
         ])
 
-        if self.yesOrNo("Configure IBM Turbonomic integration"):
+        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")

mas/cli/install/summarizer.py

@@ -86,6 +86,9 @@ class InstallSummarizerMixin():
 
         print()
         self.printParamSummary("Catalog Version", "mas_catalog_version")
+        # We only list the digest if it's specified (primary use case is when running development builds in airgap environments)
+        if self.getParam("mas_catalog_digest" != ""):
+            self.printParamSummary("Catalog Digest", "mas_catalog_digest")
         self.printParamSummary("Subscription Channel", "mas_channel")
 
         print()
@@ -246,6 +249,15 @@ class InstallSummarizerMixin():
         self.printSummary("License File", self.slsLicenseFileLocal)
         self.printParamSummary("IBM Open Registry", "sls_icr_cpopen")
 
+    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")
+        else:
+            self.printSummary("Type", "None")
+
     def eckSummary(self) -> None:
         self.printH2("Elastic Cloud on Kubernetes")
         if self.getParam("eck_action") == "install":
@@ -333,6 +345,7 @@ class InstallSummarizerMixin():
         # Application Dependencies
         self.mongoSummary()
         self.db2Summary()
+        self.cosSummary()
         self.kafkaSummary()
         self.cp4dSummary()
         self.grafanaSummary()