[patch] Predict w/ Watson OpenScale - DataMart ID Support

docs/playbooks/oneclick-predict.md

@@ -56,6 +56,7 @@ As of MAS 8.10, predict 8.8.0 will start to support SPSS Modeler, to install SPS
 - `CPD_INSTALL_SPARK` True/False - If you HAVE Spark already installed in your cluster you can skip this variable as `False` is set default
 - `CPD_INSTALL_OPENSCALE` True/False - If you HAVE Openscale already installed in your cluster you can skip this variable as `False` is set default
 - `CPD_INSTALL_SPSS` True/False - If you HAVE SPSS Modeler already installed in your cluster you can skip this variable as `False` is set default
+- `CPD_WOS_DATAMART_ID` - Ensure a Datamart ID Text box has a valid IBM Watson OpenScale instance database schema in following format `00000000-0000-0000-0000-1692782854779995`
 
 
 ## Usage

ibm/mas_devops/roles/mongodb/tasks/providers/community/validate-upgrade.yml

@@ -18,6 +18,14 @@
       - "Unable to upgrade existing Mongo instance to {{ target_mongodb_version }} in namespace {{ mongodb_namespace }} because it is not in 'Running' state."
       - "Current Mongo Status: {{ existing_mongodb.resources[0].status.phase }}"
 
+# Only allow Mongo upgrades if existing instance is in Running state
+- name: "Assert existing Mongo is running"
+  assert:
+    that: existing_mongodb.resources[0].status.phase == 'Running'
+    fail_msg:
+      - "Unable to upgrade existing Mongo instance to {{ target_mongodb_version }} in namespace {{ mongodb_namespace }} because it is not in 'Running' state."
+      - "Current Mongo Status: {{ existing_mongodb.resources[0].status.phase }}"
+
 # Only allow Mongo upgrades, prevent downgrades from happening
 - name: Assert no Mongo downgrade operations
   assert:

ibm/mas_devops/roles/suite_app_config/defaults/main.yml

@@ -34,3 +34,6 @@ cpd_wsl_project_name: "{{ lookup('env', 'CPD_WSL_PROJECT_NAME') | default('wsl-m
 # Watson Machine Learning (Predict)
 cpd_wml_instance_id: "{{ lookup('env', 'CPD_WML_INSTANCE_ID') | default('openshift', true) }}"
 cpd_wml_url: "{{ lookup('env', 'CPD_WML_URL') | default('https://internal-nginx-svc.ibm-cpd.svc:12443', true) }}"
+
+# Watson OpenScale (Predict)
+cpd_wos_datamart_id: "{{ lookup('env', 'CPD_WOS_DATAMART_ID') | default('', true) }}"

ibm/mas_devops/roles/suite_app_config/tasks/main.yml

@@ -19,7 +19,6 @@
 - name: Load mas_app variables
   include_vars: "{{ role_path }}/../suite_app_install/vars/{{ mas_app_id }}.yml"
 
-
 # 3. Run Application Specific Pre-configuration
 # -----------------------------------------------------------------------------
 # The following will auto determine storage classes to be used as persistent

ibm/mas_devops/roles/suite_app_config/vars/defaultspecs/predict.yml

@@ -5,6 +5,9 @@ mas_appws_spec:
     jdbc: "{{ mas_appws_bindings_jdbc | default( 'system' , true) }}"
     watsonstudio: system
   settings:
+    mat:
+      datamartid: "{{ cpd_wos_datamart_id }}"
+      install: "{{ true if (cpd_wos_datamart_id is defined and cpd_wos_datamart_id | length > 0) else false }}"
     watsonstudio:
       projectid: "{{ cpd_wsl_project_id }}"
     wml: