'ignore_cmd_errors': False,
'always_update': False},
- # XXX Required for old Node Manager
- # Proper configuration
- {'enabled': True,
- 'source': 'PlanetLabConf/propd.conf',
- 'dest': '/etc/proper/propd.conf',
- 'file_permissions': '644',
- 'file_owner': 'root',
- 'file_group': 'root',
- 'preinstall_cmd': '',
- 'postinstall_cmd': '/etc/init.d/proper restart',
- 'error_cmd': '',
- 'ignore_cmd_errors': True,
- 'always_update': False},
-
- # XXX Required for old Node Manager
- # Bandwidth cap
- {'enabled': True,
- 'source': 'PlanetLabConf/bwlimit.php',
- 'dest': '/etc/planetlab/bwcap',
- 'file_permissions': '644',
- 'file_owner': 'root',
- 'file_group': 'root',
- 'preinstall_cmd': '',
- 'postinstall_cmd': '',
- 'error_cmd': '',
- 'ignore_cmd_errors': True,
- 'always_update': False},
-
# Proxy ARP setup
{'enabled': True,
'source': 'PlanetLabConf/proxies.php',
'description': "Demux HTTP between slices using localhost ports. Value in the form 'host, localhost port'.",
'min_role_id': 10},
+ # Delegation
+ {'name': "delegations",
+ 'description': "Comma-seperated list of slices to give delegation authority to.",
+ 'min_role_id': 10},
+
]
# add in the platform supported rlimits to the default_attribute_types
- for entry in resource.__dict__.keys():
- if entry.find("RLIMIT_")==0:
+ for entry in resource.__dict__.keys() + ["VLIMIT_OPENFD"]:
+ if entry.find("LIMIT_")==1:
rlim = entry[len("RLIMIT_"):]
rlim = rlim.lower()
for ty in ("min","soft","hard"):
attribute = {
- 'name': "%s_%s'%(rlim,ty)",
+ 'name': "%s_%s"%(rlim,ty),
'description': "Per sliver RLIMIT %s_%s."%(rlim,ty),
- 'min_role_id': 40 #admin
+ 'min_role_id': 10 #admin
}
default_attribute_types.append(attribute)
for ptype in protocol_types:
AddPCUProtocolType(id, ptype)
+ # Run local db-config snippets
+ files = []
+ dir = "/etc/planetlab/db-config.d"
+ try:
+ files = os.listdir(dir)
+ except:
+ pass
+
+ for file in files:
+ if (file.endswith(".bak") or file.endswith("~") or
+ file.endswith(".rpmsave") or file.endswith(".rpmnew") or
+ file.endswith(".orig")):
+ continue
+ execfile(os.path.join(dir, file))
+
if __name__ == '__main__':
main()