# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: db-config,v 1.18 2007/01/30 23:11:14 mlhuang Exp $
+# $Id: db-config 1078 2007-11-15 13:38:27Z thierry $
#
from plc_config import PLCConfiguration
'min_role_id': 10},
# Bandwidth limits
- #{'name': "net_min",
- # 'description': "Minimum bandwidth (bps)",
- # 'min_role_id': 10},
- #{'name': "net_max",
- # 'description': "Maximum bandwidth (bps)",
- # 'min_role_id': 10},
- #{'name': "net_avg",
- # 'description': "Average bandwidth (bps)",
- # 'min_role_id': 10},
- {'name': "net_share",
- 'description': "Number of bandwidth shares",
+ {'name': "net_min_rate",
+ 'description': "Minimum bandwidth (kbps)",
+ 'min_role_id': 10},
+ {'name': "net_max_rate",
+ 'description': "Maximum bandwidth (kbps)",
+ 'min_role_id': 10},
+ {'name': "net_i2_min_rate",
+ 'description': "Minimum bandwidth over I2 routes (kbps)",
'min_role_id': 10},
- #{'name': "net2_min",
- # 'description': "Minimum bandwidth over routes exempt from node bandwidth limits (bps)",
- # 'min_role_id': 10},
- #{'name': "net2_max",
- # 'description': "Maximum bandwidth over routes exempt from node bandwidth limits (bps)",
- # 'min_role_id': 10},
- #{'name': "net2_avg",
- # 'description': "Average bandwidth over routes exempt from node bandwidth limits (bps)",
- # 'min_role_id': 10},
- {'name': "net2_share",
- 'description': "Number of bandwidth shares over routes exempt from node bandwidth limits",
+ {'name': "net_i2_max_rate",
+ 'description': "Maximum bandwidth over I2 routes (kbps)",
'min_role_id': 10},
- {'name': "KByteMax",
+ {'name': "net_max_kbyte",
'description': "Maximum daily network Tx KByte limit.",
'min_role_id': 10},
- {'name': "KByteThresh",
- 'description': "Threshold KByte limit before warning and throttling.",
+ {'name': "net_thresh_kbyte",
+ 'description': "KByte limit before warning and throttling.",
'min_role_id': 10},
- {'name': "KByteMaxI2",
+ {'name': "net_i2_max_kbyte",
'description': "Maximum daily network Tx KByte limit to I2 hosts.",
'min_role_id': 10},
- {'name': "KByteThreshI2",
- 'description': "Threshold KByte limit to I2 hosts before warning and throttling.",
+ {'name': "net_i2_thresh_kbyte",
+ 'description': "KByte limit to I2 hosts before warning and throttling.",
'min_role_id': 10},
-
+ {'name': "net_share",
+ 'description': "Number of bandwidth shares",
+ 'min_role_id': 10},
+ {'name': "net_i2_share",
+ 'description': "Number of bandwidth shares over I2 routes",
+ 'min_role_id': 10},
+
# Disk quota
{'name': "disk_max",
'description': "Disk quota (1k disk blocks)",
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
'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",
https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d
-Click the Reinstall link, then reboot the node.
+Update the BootState to 'Reinstall', then reboot the node.
If you have already performed this step and are still receiving this
message, please reply so that we may investigate the problem.
The most common reason for authentication failure is that the
authentication key stored in the node configuration file, does not
-match the key on record. Regenerate the node configuration file by
-visiting:
+match the key on record.
-https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d
+There are two possible steps to resolve the problem.
-Click the Configuration File link, and save the downloaded file as
-plnode.txt on either a floppy disk or a USB flash drive. Click the
-Boot link, then reboot the node.
+1. If you have used an All-in-one BootCD that includes the plnode.txt file,
+ then please check your machine for any old boot media, either in the
+ floppy drive, or on a USB stick. It is likely that an old configuration
+ is being used instead of the new configuration stored on the BootCD.
+Or,
+2. If you are using Generic BootCD image, then regenerate the node
+ configuration file by visiting:
+
+ https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d
+
+ Under 'Download', follow the 'Download plnode.txt file for %(hostname)s'
+ option, and save the downloaded file as plnode.txt on either a floppy
+ disk or a USB flash drive. Be sure the 'Boot State' is set to 'Boot',
+ and, then reboot the node.
If you have already performed this step and are still receiving this
-message, please reply so that we may investigate the problem.
+message, please reply so that we can help investigate the problem.
"""
},
https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d
-Click the Reinstall link, then reboot the node.
+Change the 'Boot State' to 'Reinstall', and then reboot the node.
If you have already performed this step and are still receiving this
message, please reply so that we may investigate the problem.
https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d
-Correct any errors, click the Reinstall link, then reboot the node.
+Correct any errors, and change the 'Boot State' to 'Reinstall', and then
+reboot the node.
If you have already performed this step and are still receiving this
message, please reply so that we may investigate the problem.
https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d
Click the Configuration File link, and save the downloaded file as
-plnode.txt on either a floppy disk or a USB flash drive. Click the
-Reinstall link, then reboot the node.
+plnode.txt on either a floppy disk or a USB flash drive. Change the
+'Boot State' to 'Reinstall', and then reboot the node.
If you have already performed this step and are still receiving this
message, please reply so that we may investigate the problem.
https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/nodes/?id=%(node_id)d
-Click the Reinstall link, then reboot the node.
+Change the 'Boot State' to 'Reinstall', and then reboot the node.
If you have already performed this step and are still receiving this
message, please reply so that we may investigate the problem.
git://git.onelab.eu / myplc.git / blobdiff