[minor] SNO Support for aws-provision

image/cli/mascli/functions/provision_aws

@@ -5,7 +5,7 @@ function provision_aws_help() {
   reset_colors
   cat << EOM
 Usage:
-  mas provision-aws-sno [options]
+  mas provision-aws [options]
 Where ${COLOR_YELLOW}specified${TEXT_RESET} each option may also be defined by setting the appropriate environment variable.
 When no options are specified on the command line, interactive-mode will be enabled by default.
 
@@ -20,6 +20,10 @@ Cluster Configuration (Required):
 IPI Configuration (Required):
   -r, --region-name ${COLOR_YELLOW}IPI_REGION${TEXT_RESET}                  Region of the cluster to be provisioned (e.g. us-east-1, us-east-2)
   -d, --domain-name ${COLOR_YELLOW}IPI_BASE_DOMAIN${TEXT_RESET}             Base Domain name (e.g. buyermas4aws.com)
+  -f, --secret-file ${COLOR_YELLOW}IPI_PULL_SECRET_FILE${TEXT_RESET}        Location of the file containing your Redhat OpenShift pull secret
+
+Single Node OpenShift (Optional)
+  -s, --single-node ${COLOR_YELLOW}SNO_MODE${TEXT_RESET}                    SNO_MODE when 'true' indicates cluster must be configured with in a single node mode (e.g. 1 control plane replica, 1 mongodb replica, etc)
 
 Other Commands:
       --no-confirm                              Provision the cluster without prompting for confirmation
@@ -54,6 +58,12 @@ function provision_aws_noninteractive() {
       -d|--domain-name)
         export IPI_BASE_DOMAIN=$1 && shift
         ;;
+      -s|--single-node)
+        export SNO_MODE=$1 && shift
+        ;;
+      -f|--secret-file)
+        export IPI_PULL_SECRET_FILE=$1 && shift
+        ;;
       --no-confirm)
         export NO_CONFIRM=true
         ;;
@@ -76,6 +86,11 @@ function provision_aws_noninteractive() {
   [[ -z "$OCP_VERSION" ]] && provision_aws_help "OCP_VERSION is not set"
   [[ -z "$IPI_REGION" ]] && provision_aws_help "IPI_REGION is not set"
   [[ -z "$IPI_BASE_DOMAIN" ]] && provision_aws_help "IPI_BASE_DOMAIN is not set"
+
+  # Set SNO Vars in case SNO_MODE = true
+  if [[ "$SNO_MODE" == "true" ]]; then
+    set_sno_vars
+  fi
 }
 
 # function set_default_vars sets default variables for a generic AWS provisioning.
@@ -93,6 +108,7 @@ function set_default_vars() {
 function set_sno_vars() {
   export IPI_CONTROLPLANE_REPLICAS=1  # IPI_CONTROLPLANE_REPLICAS
   export IPI_COMPUTE_REPLICAS=0       # IPI_COMPUTE_REPLICAS
+  export IPI_ROOTVOLUME_SIZE=250      # IPI_ROOTVOLUME_SIZE - 250GB following docs https://www.ibm.com/docs/en/masv-and-l/continuous-delivery?topic=clusters-installation-prerequisites
 }
 
 # function provision_aws_interactive contains the prompts for the different variables.
@@ -170,11 +186,13 @@ function provision_aws_interactive() {
 # The following function is a work in progress and is not ready for testing
 function provision_aws_cluster() {
   # Take the first parameter off (it will be provision-aws-sno)
+  echo "Before shift the value is: $#"
   shift
+  echo "$#"
   if [[ $# -gt 0 ]]; then
     provision_aws_noninteractive "$@"
   else
-    provision_aws_interactive "$@"
+    provision_aws_interactive
   fi
 
   ansible-playbook ibm.mas_devops.ocp_aws_provision || exit 1

python/src/mas/cli/install/app.py

@@ -866,6 +866,8 @@ def nonInteractiveMode(self) -> None:
         }
 
         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 @@ def nonInteractiveMode(self) -> None:
             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"))
 

python/src/mas/cli/install/settings/db2Settings.py

@@ -55,33 +55,7 @@ def configDb2(self) -> None:
             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 @@ def configDb2(self) -> None:
                     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")

python/src/mas/cli/install/settings/manageSettings.py

@@ -52,14 +52,16 @@ def manageSettings(self) -> None:
             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)