Merge branch 'master' into 'master'

Add new file for setting up a single node station with anaconda python.

See merge request DM/data-management!2

sbin/dm_deploy_test_single.sh

+#!/bin/sh
+
+#
+# Script used for deploying DM test environment.
+#
+# Usage:
+#
+# $0 
+#
+
+MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
+SBIN_DIR=$MY_DIR/sbin
+if [ -z "${DM_ROOT_DIR}" ]; then
+    DM_ROOT_DIR=$MY_DIR/..
+fi
+DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh
+if [ ! -f ${DM_ENV_FILE} ]; then
+    echo "Environment file ${DM_ENV_FILE} does not exist." 
+    exit 2
+fi
+. ${DM_ENV_FILE} > /dev/null
+export DM_DEPLOY_CONF=$DM_ROOT_DIR/etc/dm.deploy.conf
+
+cd $DM_ROOT_DIR
+echo ""
+echo "STARTING TEST SYSTEM DEPLOYMENT"
+echo ""
+echo "***************************"
+echo "DEPLOYING CA"
+make ca
+echo ""
+echo "***************************"
+echo "DEPLOYING CLEAN DB"
+make db
+echo ""
+echo "***************************"
+echo "DEPLOYING DS WEB SERVICE"
+make deploy-ds-web-service
+echo ""
+echo "***************************"
+echo "DEPLOYING APS DB WEB SERVICE"
+make deploy-aps-db-web-service
+echo ""
+echo "***************************"
+echo "DEPLOYING WEB PORTAL"
+make configure-web-portal
+make deploy-web-portal
+echo ""
+echo "***************************"
+echo "DEPLOYING DAQ WEB SERVICE"
+make deploy-daq-web-service
+echo ""
+echo "***************************"
+echo "DEPLOYING CAT WEB SERVICE"
+make deploy-cat-web-service
+echo ""
+echo "***************************"
+echo "DEPLOYING PROC WEB SERVICE"
+make deploy-proc-web-service
+echo "Setting up remote PROC WEB SERVICE"
+make setup-remote-proc-web-service
+echo ""
+echo "***************************"
+echo "Configuring NGINX"
+$DM_SUPPORT_DIR/sbin/configure_nginx_mongo_express.sh 
+echo ""
+echo "***************************"
+echo "Restarting DAQ Services"
+$DM_ROOT_DIR/etc/init.d/dm-daq-services restart
+echo ""
+echo "***************************"
+echo "Checking all Services"
+$DM_ROOT_DIR/etc/init.d/dm-db-services status
+$DM_ROOT_DIR/etc/init.d/dm-ds-services status
+$DM_ROOT_DIR/etc/init.d/dm-daq-services status
+echo ""
+echo "***************************"
+echo ""
+echo "TEST SYSTEM DEPLOYMENT DONE"
+

setup.sh

@@ -42,6 +42,7 @@ if [ ! -d $DM_SUPPORT_DIR ]; then
     return 1
 fi
 export DM_OPT_DIR=$DM_SUPPORT_DIR/opt
+export DM_CONDA_DIR=$DM_ROOT_DIR/../support/CONDA
 export DM_GLASSFISH_DIR=$DM_OPT_DIR/payara
 export DM_DOMAIN_NAME=domain1
 
@@ -83,7 +84,8 @@ export LD_LIBRARY_PATH
 # Setup python path. 
 # Check if we have local python
 if [ -z $DM_PYTHON_DIR ]; then
-    pythonDir=$DM_OPT_DIR/python/$DM_HOST_ARCH
+    #pythonDir=$DM_OPT_DIR/python/$DM_HOST_ARCH
+    pythonDir=$DM_CONDA_DIR
 else
     pythonDir=$DM_PYTHON_DIR
 fi