git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run lxc-enter-namespace with --noseclabel
[tests.git]
/
system
/
config_default.py
diff --git
a/system/config_default.py
b/system/config_default.py
index
ea51da6
..
8fd549a
100644
(file)
--- a/
system/config_default.py
+++ b/
system/config_default.py
@@
-1,5
+1,6
@@
+# -*- python3 -*-
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
-# Copyright (C) 201
0
INRIA
+# Copyright (C) 201
5
INRIA
#
# a configuration module is expected:
# (*) to define a config method
#
# a configuration module is expected:
# (*) to define a config method
@@
-518,7
+519,7
@@
def plc (options,index) :
'initscripts': initscripts(options,index),
'slices' : slices(options,index),
'tcp_specs' : tcp_specs(options,index),
'initscripts': initscripts(options,index),
'slices' : slices(options,index),
'tcp_specs' : tcp_specs(options,index),
- 'sfa' : sfa(options,index),
+
'sfa' : sfa(options,index),
'leases' : leases (options, index),
# big distros need more time to install nodes
'ssh_node_boot_timers': (40,38),
'leases' : leases (options, index),
# big distros need more time to install nodes
'ssh_node_boot_timers': (40,38),
@@
-619,7
+620,7
@@
def config (plc_specs, options):
return result
### for creating a sample config interactively
return result
### for creating a sample config interactively
-def sample_test_plc ():
+def sample_test_plc
_spec
():
class Void: pass
options = Void()
class Void: pass
options = Void()
@@
-629,8
+630,8
@@
def sample_test_plc ():
return config([], options)[0]
if __name__ == '__main__':
return config([], options)[0]
if __name__ == '__main__':
- s = sample_test_plc()
- print
'Sample plc_spec has the following keys'
+ s = sample_test_plc
_spec
()
+ print
('Sample plc_spec has the following keys')
for k in sorted(s.keys()):
for k in sorted(s.keys()):
- print
k
+ print
(k)