From 5be3d68fb233af553fc8e5d294b283f57c222dbb Mon Sep 17 00:00:00 2001
From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 2 Feb 2007 23:40:22 +0000
Subject: [PATCH] - remove plc_ticket_pubkey bootstrap, this is no longer
necessary
---
db-config | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/db-config b/db-config
index e5a275a..6a94941 100755
--- a/db-config
+++ b/db-config
@@ -7,7 +7,7 @@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: db-config,v 1.20 2007/02/02 19:43:01 faiyaza Exp $
+# $Id: db-config,v 1.21 2007/02/02 19:56:21 mlhuang Exp $
#
from plc_config import PLCConfiguration
@@ -581,17 +581,6 @@ def main():
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
@@ -603,7 +592,7 @@ def main():
'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",
--
2.47.0