[patch] Update disconnected install support position (#419)

ibm-mas · Aug 15, 2023 · f559193 · f559193
1 parent f1ade8a
commit f559193
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 61 deletions.
diff --git a/docs/guides/install.md b/docs/guides/install.md
@@ -56,19 +56,19 @@ If you have not already determined the best catalog source for your installation
 -------------------------------------------------------------------------------
 
 ### 2.1 Disconnected Install Limitations
-Disconnected install for IBM Maximo Application Suite is supported from MAS v8.8 onwards with some restrictions:
+Disconnected install for IBM Maximo Application Suite is fully supported as of the July 2023 catalog update, and is supported from MAS v8.8 onwards with some restrictions as detailed below:
 
 | Application                | First Version to Support Disconnected Install                   |
 | -------------------------- | --------------------------------------------------------------- |
 | Core                       |  v8.8.0 ([v8-220717-amd64](../catalogs/v8-220717-amd64.md))     |
-| Assist                     |  No support                                                     |
-| Health & Predict Utilities |  No support                                                     |
+| Assist                     |  v8.7.1 ([v8-230725-amd64](../catalogs/v8-230725-amd64.md))     |
+| Health & Predict Utilities |  v8.6.1 ([v8-230725-amd64](../catalogs/v8-230725-amd64.md))     |
 | IoT                        |  v8.5.1 ([v8-220805-amd64](../catalogs/v8-220805-amd64.md))     |
 | Manage                     |  v8.4.0 ([v8-220717-amd64](../catalogs/v8-220717-amd64.md))     |
 | Monitor                    |  v8.10.0 ([v8-230414-amd64](../catalogs/v8-230414-amd64.md))    |
 | Optimizer                  |  v8.2.0 ([v8-220717-amd64](../catalogs/v8-220717-amd64.md))     |
 | Predict                    |  v8.8.1 ([v8-230627-amd64](../catalogs/v8-230627-amd64.md))     |
-| Visual Inspection          |  No support                                                     |
+| Visual Inspection          |  v8.8.1 ([v8-230725-amd64](../catalogs/v8-230725-amd64.md))     |
 
 
 ### 2.2 Prepare the Private Registry

diff --git a/image/cli/mascli/functions/pipeline_config_applications b/image/cli/mascli/functions/pipeline_config_applications
@@ -46,23 +46,17 @@ function channel_select_manage() {
 }
 
 function channel_select_predict() {
-  if [[ -z "$AIRGAP_MODE" ]]; then
-    case $MAS_CHANNEL in
-      8.10.x)
-        MAS_APP_CHANNEL_PREDICT=8.8.x
-        ;;
-      8.9.x)
-        MAS_APP_CHANNEL_PREDICT=8.7.x
-        ;;
-      *)
-        prompt_for_input 'Custom Subscription Channel' MAS_APP_CHANNEL_PREDICT
-        ;;
-    esac
-  else
-    MAS_APP_CHANNEL_PREDICT=""
-    echo_warning "Sorry, air gap install of this application is not supported yet"
-    exit 1
-  fi
+  case $MAS_CHANNEL in
+    8.10.x)
+      MAS_APP_CHANNEL_PREDICT=8.8.x
+      ;;
+    8.9.x)
+      MAS_APP_CHANNEL_PREDICT=8.7.x
+      ;;
+    *)
+      prompt_for_input 'Custom Subscription Channel' MAS_APP_CHANNEL_PREDICT
+      ;;
+  esac
   true
 }
 
@@ -83,23 +77,17 @@ function channel_select_optimizer() {
 }
 
 function channel_select_assist() {
-  if [[ -z "$AIRGAP_MODE" ]]; then
-    case $MAS_CHANNEL in
-      8.10.x)
-        MAS_APP_CHANNEL_ASSIST=8.7.x
-        ;;
-      8.9.x)
-        MAS_APP_CHANNEL_ASSIST=8.6.x
-        ;;
-      *)
-        prompt_for_input 'Custom Subscription Channel' MAS_APP_CHANNEL_ASSIST
-        ;;
-    esac
-  else
-    MAS_APP_CHANNEL_ASSIST=""
-    echo_warning "Sorry, air gap install of this application is not supported yet"
-    exit 1
-  fi
+  case $MAS_CHANNEL in
+    8.10.x)
+      MAS_APP_CHANNEL_ASSIST=8.7.x
+      ;;
+    8.9.x)
+      MAS_APP_CHANNEL_ASSIST=8.6.x
+      ;;
+    *)
+      prompt_for_input 'Custom Subscription Channel' MAS_APP_CHANNEL_ASSIST
+      ;;
+  esac
   true
 }
 
@@ -129,8 +117,10 @@ function config_pipeline_applications() {
   MAS_APP_CHANNEL_PREDICT=''
   MAS_APP_CHANNEL_ASSIST=''
   MAS_APP_CHANNEL_VISUALINSPECTION=''
-  MAS_APP_CHANNEL_OPTIMIZER='';        MAS_APP_PLAN_OPTIMIZER=''
+  MAS_APP_CHANNEL_OPTIMIZER='';
+  MAS_APP_PLAN_OPTIMIZER=''
 
+  # IoT and Monitor haven't been tested on Single Node OpenShift
   if [[ "$SNO_MODE" != "true" ]]; then
     # IoT
     if prompt_for_confirm "Install IoT"; then
@@ -173,6 +163,7 @@ function config_pipeline_applications() {
     fi
   fi
 
+  # Optimizer, Predict, Visual Inspection, & Assist haven't been tested on Single Node OpenShift
   if [[ "$SNO_MODE" != "true" ]]; then
     if prompt_for_confirm "Install Optimizer"; then
       channel_select_optimizer || exit 1
@@ -188,28 +179,25 @@ function config_pipeline_applications() {
      channel_select_visualinspection || exit 1
     fi
 
-    # Applications only supported in online installs
-    if [[ -z "$AIRGAP_MODE" ]]; then
-      # Applications that require Manage
-      # TODO: these applications require Health component specifically,
-      # need to review this code when add-ons selection are in place
-      if [[ "$MAS_APP_CHANNEL_MANAGE" != '' ]]; then
-        # Predict
-        if prompt_for_confirm "Install Predict"; then
-          channel_select_predict || exit 1
-          if prompt_for_confirm "+ Install IBM SPSS Statistics"; then
-            CPD_INSTALL_SPSS=true
-          fi
-          if prompt_for_confirm "+ Install Watson OpenScale"; then
-            CPD_INSTALL_OPENSCALE=true
-          fi
+    # Applications that require Manage
+    # TODO: these applications require Health component specifically,
+    # need to review this code when add-ons selection are in place
+    if [[ "$MAS_APP_CHANNEL_MANAGE" != '' ]]; then
+      # Predict
+      if prompt_for_confirm "Install Predict"; then
+        channel_select_predict || exit 1
+        if prompt_for_confirm "+ Install IBM SPSS Statistics"; then
+          CPD_INSTALL_SPSS=true
+        fi
+        if prompt_for_confirm "+ Install Watson OpenScale"; then
+          CPD_INSTALL_OPENSCALE=true
         fi
       fi
+    fi
 
-      # Assist
-      if prompt_for_confirm "Install Assist"; then
-        channel_select_assist || exit 1
-      fi
+    # Assist
+    if prompt_for_confirm "Install Assist"; then
+      channel_select_assist || exit 1
     fi
 
     # Assist Dependencies

diff --git a/image/cli/mascli/mas b/image/cli/mascli/mas
@@ -144,9 +144,6 @@ case $1 in
     echo "${TEXT_UNDERLINE}IBM Maximo Application Suite Installer (v${VERSION})${TEXT_RESET}"
     echo "Powered by ${COLOR_CYAN}${TEXT_UNDERLINE}https://github.com/ibm-mas/ansible-devops/${TEXT_RESET} and ${COLOR_CYAN}${TEXT_UNDERLINE}https://tekton.dev/${TEXT_RESET}"
     echo
-    echo "${TEXT_UNDERLINE}${TEXT_DIM}Current Limitations${TEXT_RESET}"
-    echo "${TEXT_DIM}1. Maximo Assist, Predict, and Visual Inspection are not supported in disconnected installs as of MAS v8.10"
-    echo
     reset_colors
     install "$@"
     ;;