git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag nodemanager-7.0-0
[nodemanager.git]
/
config.py
diff --git
a/config.py
b/config.py
index
6288bf7
..
700b2db
100644
(file)
--- a/
config.py
+++ b/
config.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
3
#
# Parses the PLC configuration file /etc/planetlab/plc_config, which
# is bootstrapped by Boot Manager, but managed by us.
#
# Parses the PLC configuration file /etc/planetlab/plc_config, which
# is bootstrapped by Boot Manager, but managed by us.
@@
-6,8
+6,8
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id$
-#
+
+import os
class Config:
"""
class Config:
"""
@@
-17,17
+17,31
@@
class Config:
def __init__(self, file = "/etc/planetlab/plc_config"):
try:
def __init__(self, file = "/etc/planetlab/plc_config"):
try:
- exec
file(file
, self.__dict__)
+ exec
(compile(open(file).read(), file, 'exec')
, self.__dict__)
except:
except:
- raise Exception
, "Could not parse " + file
+ raise Exception
("Could not parse " + file)
if int(self.PLC_API_PORT) == 443:
uri = "https://"
if int(self.PLC_API_PORT) == 443:
uri = "https://"
+ if hasattr(self, 'PLC_API_CA_SSL_CRT'):
+ self.cacert = self.PLC_API_CA_SSL_CRT
+ elif os.path.exists('/usr/boot/cacert.pem'):
+ self.cacert = '/usr/boot/cacert.pem'
+ else:
+ raise Exception("No boot server certificate bundle available")
else:
uri = "http://"
else:
uri = "http://"
+ self.cacert = None
uri += self.PLC_API_HOST + \
":" + str(self.PLC_API_PORT) + \
"/" + self.PLC_API_PATH + "/"
self.plc_api_uri = uri
uri += self.PLC_API_HOST + \
":" + str(self.PLC_API_PORT) + \
"/" + self.PLC_API_PATH + "/"
self.plc_api_uri = uri
+
+
+if __name__ == '__main__':
+ from pprint import pprint
+ for (k, v) in Config().__dict__.items():
+ if k not in ['__builtins__']:
+ pprint ( (k, v), )