From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Mon, 7 Apr 2008 21:41:20 +0000 (+0000)
Subject: fix slice prefix.
X-Git-Tag: MyPLC-4.2-6~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bba2a11ab608f600c1b54dc0dc9af77f8c9fe4dd;p=myplc.git

fix slice prefix.
---

diff --git a/db-config b/db-config
index 64c5e24..81440d1 100755
--- a/db-config
+++ b/db-config
@@ -537,7 +537,7 @@ def main():
             file = open(root + "/" + f, "ro")
             default_initscripts.append({"name": plc['slice_prefix'] + "_" + f,
                                         "enabled": True,
-                                        "script": file.read().replace("XXXSITEXXX", url)})
+                                        "script": file.read().replace("XXXSITEXXX", url).replace("XXXPREFIXXXX", plc['slice_prefix'])})
             file.close()
 
     # Get list of existing initscripts
diff --git a/plc_sliceinitscripts/sirius b/plc_sliceinitscripts/sirius
index fe68581..8dd41be 100644
--- a/plc_sliceinitscripts/sirius
+++ b/plc_sliceinitscripts/sirius
@@ -166,7 +166,7 @@ def updateloans():
     log('Current loans are %s' % loans)
 
     if DEBUGLEVEL < 2:
-        nodemanager.SetLoans('princeton_sirius', loans)
+        nodemanager.SetLoans('XXXPREFIXXXX_sirius', loans)
     log('Updated loans successfully')
 
     recipientcond.acquire()