eliminate remaining reference to /opt/planetstack from python files
diff --git a/planetstack/hpc_observer/fsck.py b/planetstack/hpc_observer/fsck.py
index c1d833a..817d616 100644
--- a/planetstack/hpc_observer/fsck.py
+++ b/planetstack/hpc_observer/fsck.py
@@ -5,8 +5,8 @@
import os
import sys
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
-sys.path.append("/opt/planetstack")
-from planetstack.config import Config, DEFAULT_CONFIG_FN
+sys.path.append("/opt/xos")
+from planetstack.config import Config, DEFAULT_CONFIG_FN, XOS_DIR
from util.logger import Logger, logging
from observer.syncstep import SyncStep
@@ -27,7 +27,7 @@
if hasattr(Config(), "observer_steps_dir"):
step_dir = Config().observer_steps_dir
else:
- step_dir = "/opt/planetstack/observer/steps"
+ step_dir = XOS_DIR+"/observer/steps"
for fn in os.listdir(step_dir):
pathname = os.path.join(step_dir,fn)
@@ -58,7 +58,7 @@
def main():
if not "-C" in sys.argv:
- print >> sys.stderr, "You probably wanted to use -C /opt/planetstack/hpc_observer/hpc_observer_config"
+ print >> sys.stderr, "You probably wanted to use -C " + XOS_DIR + "/hpc_observer/hpc_observer_config"
# Generate command line parser
parser = argparse.ArgumentParser(usage='%(prog)s [options]')
diff --git a/planetstack/hpc_observer/hpclib.py b/planetstack/hpc_observer/hpclib.py
index a4fa3b9..7986540 100644
--- a/planetstack/hpc_observer/hpclib.py
+++ b/planetstack/hpc_observer/hpclib.py
@@ -5,7 +5,7 @@
import xmlrpclib
if __name__ == '__main__':
- sys.path.append("/opt/planetstack")
+ sys.path.append("/opt/xos")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
from planetstack.config import Config
diff --git a/planetstack/hpc_observer/run.sh b/planetstack/hpc_observer/run.sh
index 3369a4a..8ebecc9 100644
--- a/planetstack/hpc_observer/run.sh
+++ b/planetstack/hpc_observer/run.sh
@@ -1 +1,2 @@
-python hpc-backend.py -C /opt/planetstack/hpc_observer/hpc_observer_config
+export XOS_DIR=/opt/xos
+python hpc-backend.py -C $XOS_DIR/hpc_observer/hpc_observer_config
diff --git a/planetstack/hpc_observer/start.sh b/planetstack/hpc_observer/start.sh
index b4df9f5..c24ca3e 100644
--- a/planetstack/hpc_observer/start.sh
+++ b/planetstack/hpc_observer/start.sh
@@ -1 +1,2 @@
-nohup python hpc-backend.py -C /opt/planetstack/hpc_observer/hpc_observer_config > /dev/null 2>&1 &
+export XOS_DIR=/opt/xos
+nohup python hpc-backend.py -C $XOS_DIR/hpc_observer/hpc_observer_config > /dev/null 2>&1 &
diff --git a/planetstack/hpc_observer/upload.sh b/planetstack/hpc_observer/upload.sh
deleted file mode 100644
index 1a1b90d..0000000
--- a/planetstack/hpc_observer/upload.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-scp hpc_observer_config run.sh start.sh stop.sh root@viccidev1.cs.princeton.edu:/opt/planetstack/hpc_observer/
-scp steps/*.py root@viccidev1.cs.princeton.edu:/opt/planetstack/hpc_observer/steps/
-scp deleters/*.py root@viccidev1.cs.princeton.edu:/opt/planetstack/hpc_observer/deleters/