Dashboard should only be installed on the data node

Fixes ESGF#458
nci-vl · Sep 17, 2018 · ec426a4 · ec426a4 · pchengi · Feb 13, 2019
1 parent ec1f07e
commit ec426a4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/esg-node b/esg-node
@@ -7164,9 +7164,9 @@ main() {
         [ $((sel & TEST_BIT))    != 0 ] && test_tomcat
         [ $((sel & INSTALL_BIT)) != 0 ] && [ $((sel & DATA_BIT+COMPUTE_BIT)) != 0 ] && setup_tds ${upgrade_mode}
         [ $((sel & TEST_BIT))    != 0 ] && [ $((sel & DATA_BIT+COMPUTE_BIT)) != 0 ] && test_tds
-        [ $((sel & INSTALL_BIT)) != 0 ] && setup_subsystem node-manager esgf-node-manager #(tomcat off)
+        [ $((sel & INSTALL_BIT)) != 0 ] && [ $((sel & IDP_BIT+DATA_BIT)) != 0 ] && setup_subsystem node-manager esgf-node-manager #(tomcat off)
 
-        [ $((sel & INSTALL_BIT)) != 0 ] && setup_subsystem dashboard esgf-dashboard #(tomcat off)
+        [ $((sel & INSTALL_BIT)) != 0 ] && [ $((sel & DATA_BIT)) != 0 ] && setup_subsystem dashboard esgf-dashboard #(tomcat off)
 
         #[ $((sel & INSTALL_BIT)) != 0 ] && [ $((sel & DATA_BIT)) != 0 ] && setup_subsystem desktop esgf-desktop #(tomcat off)