Cherry-pick from https://gerrit.onos.onlab.us/#/c/68/
Revise onos.py for ramcloud branch
issue: ONOS-959
Conflicts:
start-rest.sh
NOTE: The above conflict has been resolved by hand.
In the process, minor refactoring/editing was done
for consistency with the rest of the scripts:
ONOSDIR -> ONOS_HOME
NOTE2: Fixed few issues in file vm-utils/onos.py that are related
to RAMCloud:
- Fixed the path to the RAMCloud ramcloud.conf configuration file
- Fixed the path to the RAMCloud daemon.
NOTE3: Fixed the modules list as set in baseModule in file vm-utils/onos.py
to reflect the dev/ramcloud-new-datamodel list.
NOTE4: Changed the file permission of vm-utils/onos.py so it is executable.
Change-Id: I4e245f694f9ed4182b49410707d214a2d6a056de
diff --git a/start-ramcloud-server.sh b/start-ramcloud-server.sh
index 0158be2..939543a 100755
--- a/start-ramcloud-server.sh
+++ b/start-ramcloud-server.sh
@@ -5,7 +5,7 @@
# Set paths
ONOS_HOME=`dirname $0`
RAMCLOUD_DIR=${HOME}/ramcloud
-LOGDIR=${ONOS_HOME}/onos-logs
+LOGDIR=${ONOS_LOGDIR:-${ONOS_HOME}/onos-logs}
RAMCLOUD_LOG=${LOGDIR}/ramcloud.server.`hostname`.log
coordinatorip=`grep coordinatorIp ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
coordinatorport=`grep coordinatorPort ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`