Merge branch 'stable' into monthlyupdate

Author: prveenkumr

src/mas/devops/templates/pipelinerun-install.yml.j2

@@ -707,6 +707,10 @@ spec:
     # -------------------------------------------------------------------------
     - name: mas_app_channel_monitor
       value: "{{ mas_app_channel_monitor }}"
+  {%- if mas_monitor_install_order is defined and mas_monitor_install_order != "" %}
+    - name: mas_monitor_install_order
+      value: "{{ mas_monitor_install_order }}"
+  {%- endif %}
 {%- endif %}
 {%- if mas_app_channel_optimizer is defined and mas_app_channel_optimizer != "" %}
 

src/mas/devops/templates/pipelinerun-upgrade.yml.j2

@@ -119,6 +119,13 @@ spec:
       value: "{{ db2_data_storage_size }}"
   {%- endif %}
 {%- endif %}
+{%- if mas_monitor_install_order is defined and mas_monitor_install_order != "" %}
+
+    # Monitor Install Order
+    # -------------------------------------------------------------------------
+    - name: mas_monitor_install_order
+      value: "{{ mas_monitor_install_order }}"
+{%- endif %}
 {%- if mas_app_channel_manage is defined and mas_app_channel_manage != "" %}
 
     # Manage Application