git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
[sfa.git]
/
sfa
/
server
/
sfa-start.py
diff --git
a/sfa/server/sfa-start.py
b/sfa/server/sfa-start.py
index
22a8091
..
0dd53b6
100755
(executable)
--- a/
sfa/server/sfa-start.py
+++ b/
sfa/server/sfa-start.py
@@
-14,7
+14,7
@@
# is up to date and accurate.
#
# 1) Import the existing planetlab database, creating the
# is up to date and accurate.
#
# 1) Import the existing planetlab database, creating the
-# appropriate SFA records. This is done by running the "sfa-import
-plc
.py" tool.
+# appropriate SFA records. This is done by running the "sfa-import.py" tool.
#
# 2) Create a "trusted_roots" directory and place the certificate of the root
# authority in that directory. Given the defaults in sfa-import-plc.py, this
#
# 2) Create a "trusted_roots" directory and place the certificate of the root
# authority in that directory. Given the defaults in sfa-import-plc.py, this
@@
-130,8
+130,9
@@
def update_cert_records(gids):
Removes old records from the db.
"""
# import db stuff here here so this module can be loaded by PlcComponentApi
Removes old records from the db.
"""
# import db stuff here here so this module can be loaded by PlcComponentApi
- from sfa.storage.alchemy import dbsession
- from sfa.storage.persistentobjs import RegRecord
+ from sfa.storage.alchemy import global_dbsession
+ from sfa.storage.model import RegRecord
+ dbsession = global_dbsession
if not gids:
return
# get records that actually exist in the db
if not gids:
return
# get records that actually exist in the db