git://git.onelab.eu
/
myplc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more conventional notation for site and prefix as replaced by db-config
[myplc.git]
/
plc_sliceinitscripts
/
sirius
diff --git
a/plc_sliceinitscripts/sirius
b/plc_sliceinitscripts/sirius
index
8dd41be
..
6cbf443
100644
(file)
--- a/
plc_sliceinitscripts/sirius
+++ b/
plc_sliceinitscripts/sirius
@@
-106,7
+106,9
@@
class Periodic:
SLOTDURATION = ONEHOUR
SLOTDURATION = ONEHOUR
-SCHEDULEURL = 'XXXSITEXXX/planetlab/sirius/schedule.txt'
+# instances of @SITE@ and @PREFIX@ below are replaced
+# as appropriate by db-config
+SCHEDULEURL = '@SITE@/planetlab/sirius/schedule.txt'
schedulelock = threading.Lock()
schedulelock = threading.Lock()
@@
-166,7
+168,7
@@
def updateloans():
log('Current loans are %s' % loans)
if DEBUGLEVEL < 2:
log('Current loans are %s' % loans)
if DEBUGLEVEL < 2:
- nodemanager.SetLoans('
XXXPREFIXXXX
_sirius', loans)
+ nodemanager.SetLoans('
@PREFIX@
_sirius', loans)
log('Updated loans successfully')
recipientcond.acquire()
log('Updated loans successfully')
recipientcond.acquire()