git://git.onelab.eu
/
myplc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bd6a98f
)
- remove plc_ticket_pubkey bootstrap, this is no longer necessary
author
Mark Huang
<mlhuang@cs.princeton.edu>
Fri, 2 Feb 2007 23:40:22 +0000
(23:40 +0000)
committer
Mark Huang
<mlhuang@cs.princeton.edu>
Fri, 2 Feb 2007 23:40:22 +0000
(23:40 +0000)
db-config
patch
|
blob
|
history
diff --git
a/db-config
b/db-config
index
e5a275a
..
6a94941
100755
(executable)
--- a/
db-config
+++ b/
db-config
@@
-7,7
+7,7
@@
# 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: db-config,v 1.2
0 2007/02/02 19:43:01 faiyaza
Exp $
+# $Id: db-config,v 1.2
1 2007/02/02 19:56:21 mlhuang
Exp $
#
from plc_config import PLCConfiguration
#
from plc_config import PLCConfiguration
@@
-581,17
+581,6
@@
def main():
else:
UpdateSliceAttributeType(default_attribute_type['name'], default_attribute_type)
else:
UpdateSliceAttributeType(default_attribute_type['name'], default_attribute_type)
- # Get contents of SSL public certificate used for signing slice tickets
- try:
- plc_ticket_pubkey = ""
- for line in file(plc_ma_sa['ca_ssl_key_pub']):
- # Skip comments
- if line[0:5] != "-----":
- # XXX The embedded newlines matter, do not strip()!
- plc_ticket_pubkey += line
- except:
- plc_ticket_pubkey = '%KEY%'
-
# Create/update system slices
legacy_slices = [
# XXX Required for old Node Manager
# Create/update system slices
legacy_slices = [
# XXX Required for old Node Manager
@@
-603,7
+592,7
@@
def main():
'expires': sys.maxint,
'attributes': [('plc_slice_type', "VServerSlice"),
('plc_agent_version', "1.0"),
'expires': sys.maxint,
'attributes': [('plc_slice_type', "VServerSlice"),
('plc_agent_version', "1.0"),
- ('plc_ticket_pubkey',
plc_ticket_pubkey
)]},
+ ('plc_ticket_pubkey',
""
)]},
# XXX Required for old Node Manager
{'name': "pl_conf_vserverslice",
# XXX Required for old Node Manager
{'name': "pl_conf_vserverslice",