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
added getCredentialFromRegistry and getCredentialFromLocalRegistry
[sfa.git]
/
geni
/
plc.py
diff --git
a/geni/plc.py
b/geni/plc.py
index
a9322ad
..
8565fee
100644
(file)
--- a/
geni/plc.py
+++ b/
geni/plc.py
@@
-108,20
+108,20
@@
def main():
# start registry server
if (options.registry):
r = Registry("", registry_port, key_file, cert_file)
# start registry server
if (options.registry):
r = Registry("", registry_port, key_file, cert_file)
- r.trusted_cert_list = TrustedRoots.get_list()
- r.hierarchy = AuthHierarchy
+
#
r.trusted_cert_list = TrustedRoots.get_list()
+
#
r.hierarchy = AuthHierarchy
r.start()
# start aggregate manager
if (options.am):
a = Aggregate("", aggregate_port, key_file, cert_file)
r.start()
# start aggregate manager
if (options.am):
a = Aggregate("", aggregate_port, key_file, cert_file)
- a.trusted_cert_list = TrustedRoots.get_list()
+
#
a.trusted_cert_list = TrustedRoots.get_list()
a.start()
# start slice manager
if (options.sm):
s = SliceMgr("", slicemgr_port, key_file, cert_file)
a.start()
# start slice manager
if (options.sm):
s = SliceMgr("", slicemgr_port, key_file, cert_file)
- s.trusted_cert_list = TrustedRoots.get_list()
+
#
s.trusted_cert_list = TrustedRoots.get_list()
s.start()
if __name__ == "__main__":
s.start()
if __name__ == "__main__":