[patch] back out commits from PR 1287

ibm/mas_devops/roles/suite_app_config/README.md

@@ -58,20 +58,6 @@ Defines the app components and versions to configure in the application workspac
 - Environment Variable: `MAS_APPWS_COMPONENTS`
 - Default: Application specific
 
-### mas_pod_templates_dir
-This role will look for a configuration files named:
-
-- `ibm-mas-manage-manageworkspace.yml`
-- `ibm-mas-manage-imagestitching.yml`
-- `ibm-mas-manage-slackproxy.yml`
-- `ibm-mas-manage-healthextworkspace.yml`
-
-The content of the configuration file should be the yaml block that you wish to be inserted into the ManageWorkspace CR. `ibm-mas-manage-manageworkspace.yml` will be inserted into the ManageWorkspace CR `spec -> podTemplates` whereas the component ones e.g, `ibm-mas-manage-imagestitching.yml` will be under `spec -> components -> civil -> podTemplates`. The ibm-mas-manage-ws operator will then pass this on to the corresponding component CR when available.
-
-This is an example of one of the components (civil) - refer to the [BestEfforts reference configuration in the MAS CLI](https://github.com/ibm-mas/cli/blob/master/image/cli/mascli/templates/pod-templates/best-effort/ibm-mas-manage-imagestitching.yml).
-For full documentation of the supported options refer to the [Customizing Pod Templates](https://www.ibm.com/docs/en/mas-cd/continuous-delivery?topic=configuring-customizing-workloads) in the product documentation.
-
-
 Role Variables - Predict Configuration
 -------------------------------------------------------------------------------
 ### mas_appws_settings_deployment_size

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

@@ -34,8 +34,3 @@ 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) }}"
-
-# PodTemplates configuration
-# mas_pod_templates_dir: path to directory containing podTemplates configuration
-# -----------------------------------------------------------------------------
-mas_pod_templates_dir: "{{ lookup('env', 'MAS_POD_TEMPLATES_DIR') | default('', true) }}"

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

@@ -19,12 +19,6 @@
 - name: Load mas_app variables
   include_vars: "{{ role_path }}/../suite_app_install/vars/{{ mas_app_id }}.yml"
 
-- name: Run application specific tasks
-  when:
-    - mas_app_id is in ['manage']  # applications which have something to process before installing the operator
-  include_tasks: "tasks/{{ 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/manage.yml

@@ -2,8 +2,7 @@
 # Default application spec for Manage
 mas_appws_spec:
   bindings: "{{ mas_app_bindings }}"
-  podTemplates: "{{ ((ibm_mas_manage_manageworkspace_pod_templates is defined) and (ibm_mas_manage_manageworkspace_pod_templates | length != 0)) | ternary(ibm_mas_manage_manageworkspace_pod_templates, []) }}"
-  components: "{{ ((mas_app_components_manage is defined) and (mas_app_components_manage | length != 0)) | ternary(mas_app_components_manage, {'base':{'version':'latest'}}) }}"
+  components: "{{ mas_appws_components | default({'base':{'version':'latest'}}, true) }}"  
   settings:
     deployment:
       persistentVolumes: "{{ mas_app_settings_persistent_volumes }}"

ibm/mas_devops/roles/suite_app_config/vars/manage.yml

@@ -240,6 +240,4 @@ mas_app_bindings_jdbc_wsl:
 
 mas_app_bindings: "{{ mas_app_bindings_jdbc_wsl if mas_appws_bindings_health_wsl_flag else mas_app_bindings_jdbc }}"
 
-
-manage_workspace_default_podTemplates_containers: ['monitoragent', 'manage-maxinst']
 # -------------------

ibm/mas_devops/roles/suite_app_install/README.md

@@ -204,18 +204,6 @@ This is an example of one of the components (actions) - refer to the [BestEffort
 For full documentation of the supported options refer to the [Customizing Pod Templates](https://www.ibm.com/docs/en/mas-cd/continuous-delivery?topic=configuring-customizing-workloads) in the product documentation.
 
 
-Role Variables - Manage Configuration
--------------------------------------------------------------------------------
-### mas_pod_templates_dir
-This role will look for a configuration files named for manage:
-
-- `ibm-mas-manage-manageapp.yml`
-
-The content of the configuration file should be the yaml block that you wish to be inserted into the ManageApp CR. `ibm-mas-manage-manageapp.yml` will be inserted into the ManageApp CR `spec -> podTemplates`. The ibm-mas-manage operator will then pass this on to the corresponding deployments when available.
-
-For full documentation of the supported options refer to the [Customizing Pod Templates](https://www.ibm.com/docs/en/mas-cd/continuous-delivery?topic=configuring-customizing-workloads) in the product documentation.
-
-
 Role Variables - Monitor Configuration
 -------------------------------------------------------------------------------
 ### mas_app_settings_monitor_deployment_size

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

@@ -18,7 +18,7 @@
 # 2.1  Run Application Specific Tasks
 - name: Run application specific tasks
   when:
-    - mas_app_id is in ['iot', 'visualinspection', 'manage']  # applications which have something to process before installing the operator
+    - mas_app_id is in ['iot', 'visualinspection'] # applications which have something to process before installing the operator
   include_tasks: "tasks/{{ mas_app_id }}.yml"
 
 # 2.2 Load default application spec, if none is provided by user

ibm/mas_devops/roles/suite_app_install/vars/defaultspecs/manage.yml

@@ -1,4 +1,3 @@
 ---
 # Default application spec for Manage
-mas_app_spec:
-  podTemplates: "{{ ((ibm_mas_manage_manageapp_pod_templates is defined) and (ibm_mas_manage_manageapp_pod_templates | length != 0)) | ternary(ibm_mas_manage_manageapp_pod_templates, []) }}"
+mas_app_spec: {}