Merge "Modified contrail-webui.service and contrailWebServer.sh to"

Juniper · Feb 9, 2017 · 81fa957 · 81fa957
2 parents acd1ea7 + 75b7817
commit 81fa957
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/common/control_files/contrail-webui-middleware.service b/common/control_files/contrail-webui-middleware.service
@@ -4,7 +4,7 @@ After=redis.service
 Requires=redis.service
 
 [Service]
-ExecStart=/usr/src/contrail/contrail-webui/contrailWebMiddleware.sh
+ExecStart=/usr/src/contrail/contrail-web-core/contrailWebMiddleware.sh
 Restart=always
 LimitCORE=infinity
 

diff --git a/common/control_files/contrail-webui.service b/common/control_files/contrail-webui.service
@@ -4,7 +4,7 @@ After=redis.service
 Requires=redis.service
 
 [Service]
-ExecStart=/usr/src/contrail/contrail-webui/contrailWebServer.sh
+ExecStart=/usr/src/contrail/contrail-web-core/contrailWebServer.sh
 Restart=always
 LimitCORE=infinity
 

diff --git a/common/control_files/contrailWebMiddleware.sh b/common/control_files/contrailWebMiddleware.sh
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-cd /usr/src/contrail/contrail-webui;
-if command -v nodejs-contrail > /dev/null; then
-  node_exec=nodejs-contrail;
-else
-  echo "error: Failed dependencies: nodejs-contrail is needed";
-  exit;
-fi;
-$node_exec jobServerStart.js 0.0.0.0
+cd /usr/src/contrail/contrail-web-core;
+node jobServerStart.js
 
diff --git a/common/control_files/contrailWebServer.sh b/common/control_files/contrailWebServer.sh
@@ -1,10 +1,4 @@
 #!/bin/bash
 
-cd /usr/src/contrail/contrail-webui;
-if command -v nodejs-contrail > /dev/null; then
-  node_exec=nodejs-contrail;
-else
-  echo "error: Failed dependencies: nodejs-contrail is needed";
-  exit;
-fi;
-$node_exec webServerStart.js 0.0.0.0
+cd /usr/src/contrail/contrail-web-core;
+node webServerStart.js