mas-cli 13.13.0__tar.gz → 13.14.0__tar.gz

{mas_cli-13.13.0 → mas_cli-13.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mas-cli
-Version: 13.13.0
+Version: 13.14.0
 Summary: Python Admin CLI for Maximo Application Suite
 Home-page: https://github.com/ibm-mas/cli
 Author: David Parker

{mas_cli-13.13.0 → mas_cli-13.14.0}/src/mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "13.13.0"  # Python module compatible semver
+__version__ = "13.14.0"  # Python module compatible semver

{mas_cli-13.13.0 → mas_cli-13.14.0}/src/mas/cli/cli.py

@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "13.13.0"
+        self.version = "13.14.0"
         self.h1count = 0
         self.h2count = 0
 

{mas_cli-13.13.0 → mas_cli-13.14.0}/src/mas/cli/install/app.py

@@ -866,6 +866,8 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
         }
 
         self.configGrafana()
+        self.configSNO()
+        self.setDB2DefaultSettings()
 
         for key, value in vars(self.args).items():
             # These fields we just pass straight through to the parameters and fail if they are not set
@@ -1025,6 +1027,9 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
             if self.getParam("is_full_manage") != "false":
                 self.setParam("is_full_manage", "true")
 
+            # Configure Storage and Access mode
+            self.manageStorageAndAccessMode()
+
         # Load the catalog information
         self.chosenCatalog = getCatalog(self.getParam("mas_catalog_version"))
 

{mas_cli-13.13.0 → mas_cli-13.14.0}/src/mas/cli/install/settings/db2Settings.py

@@ -55,33 +55,7 @@ class Db2SettingsMixin():
             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"
         ])
 
-        self.setParam("db2_cpu_requests", "4000m")
-        self.setParam("db2_cpu_limits", "6000m")
-        self.setParam("db2_memory_requests", "8Gi")
-        self.setParam("db2_memory_limits", "12Gi")
-
-        if self.isSNO():
-            # Set smaller defaults for SNO deployments
-            self.setParam("db2_meta_storage_size", "10Gi")
-            self.setParam("db2_backup_storage_size", "10Gi")
-            self.setParam("db2_logs_storage_size", "10Gi")
-            self.setParam("db2_temp_storage_size", "10Gi")
-            self.setParam("db2_data_storage_size", "20Gi")
-
-            # Configure the access mode to RWO
-            self.params["db2_meta_storage_accessmode"] = "ReadWriteOnce"
-            self.params["db2_backup_storage_accessmode"] = "ReadWriteOnce"
-            self.params["db2_logs_storage_accessmode"] = "ReadWriteOnce"
-            self.params["db2_data_storage_accessmode"] = "ReadWriteOnce"
-
-            # Also reduce the CPU requests
-            self.params["db2_cpu_requests"] = "300m"
-        else:
-            self.setParam("db2_meta_storage_size", "20Gi")
-            self.setParam("db2_backup_storage_size", "100Gi")
-            self.setParam("db2_logs_storage_size", "100Gi")
-            self.setParam("db2_temp_storage_size", "100Gi")
-            self.setParam("db2_data_storage_size", "100Gi")
+        self.setDB2DefaultSettings()
 
         instanceId = self.getParam('mas_instance_id')
         # Do we need to set up an IoT database?
@@ -201,3 +175,32 @@ class Db2SettingsMixin():
                     self.promptForString(" + Backup Volume", "db2_backup_storage_size", default=self.getParam("db2_backup_storage_size"))
             else:
                 self.setParam("db2_namespace", "db2u")
+
+    def setDB2DefaultSettings(self) -> None:
+
+        self.setParam("db2_cpu_requests", "4000m")
+        self.setParam("db2_cpu_limits", "6000m")
+        self.setParam("db2_memory_requests", "8Gi")
+        self.setParam("db2_memory_limits", "12Gi")
+
+        if self.isSNO():
+            # Set smaller defaults for SNO deployments
+            self.setParam("db2_meta_storage_size", "10Gi")
+            self.setParam("db2_backup_storage_size", "10Gi")
+            self.setParam("db2_logs_storage_size", "10Gi")
+            self.setParam("db2_temp_storage_size", "10Gi")
+            self.setParam("db2_data_storage_size", "20Gi")
+
+            # Configure the access mode to RWO
+            self.params["db2_meta_storage_accessmode"] = "ReadWriteOnce"
+            self.params["db2_backup_storage_accessmode"] = "ReadWriteOnce"
+            self.params["db2_logs_storage_accessmode"] = "ReadWriteOnce"
+            self.params["db2_data_storage_accessmode"] = "ReadWriteOnce"
+            self.params["db2_cpu_requests"] = "300m"
+
+        else:
+            self.setParam("db2_meta_storage_size", "20Gi")
+            self.setParam("db2_backup_storage_size", "100Gi")
+            self.setParam("db2_logs_storage_size", "100Gi")
+            self.setParam("db2_temp_storage_size", "100Gi")
+            self.setParam("db2_data_storage_size", "100Gi")

{mas_cli-13.13.0 → mas_cli-13.14.0}/src/mas/cli/install/settings/manageSettings.py

@@ -52,14 +52,16 @@ class ManageSettingsMixin():
             self.manageSettingsDatabase()
             self.manageSettingsCustomizationArchive()
             self.manageSettingsOther()
-
-            # 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.manageStorageAndAccessMode()
+
+    def manageStorageAndAccessMode(self) -> None:
+        # 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)