remove omsagent.conf validation

microsoft · Oct 31, 2017 · dd0d585 · dd0d585
1 parent 8c8259c
commit dd0d585
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/installer/scripts/service_control b/installer/scripts/service_control
@@ -148,25 +148,17 @@ should_check_omsadmin_conf()
 
 setup_variables()
 {
-
     local initial_conf_dir=
     if [ -z "$1" ]; then
         initial_conf_dir="$ETC_DIR/conf/omsadmin.conf"
     else
         initial_conf_dir="$ETC_DIR/$1/conf/omsadmin.conf"
     fi
 
-    WS_STATUS=0
-    should_check_omsadmin_conf $1    
-    if [ $? -eq 0 ]; then
-        check_omsadmin_conf $initial_conf_dir
-        WS_STATUS=$?
-    fi
-    if [ "$WS_STATUS" -eq "0" ]; then
-        . $initial_conf_dir
-        WS_STATUS=$?
-    fi
-
+    WS_STATUS=0    
+    . $initial_conf_dir
+    WS_STATUS=$?
+
     if [ "$WS_STATUS" -eq "0" ]; then
 
         VAR_DIR_WS=$VAR_DIR/$WORKSPACE_ID