X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=db-config;h=045788757d5e94ca7318763fef47838b01d06552;hb=401af0c77ac1495e7e08616406dd6c3ee62f637f;hp=d522bfd358aea4b3334f9cccb30532e2cce9fe57;hpb=d0b4544a26e498abac31a96bb3e34f5dbb7db650;p=myplc.git diff --git a/db-config b/db-config index d522bfd..0457887 100755 --- a/db-config +++ b/db-config @@ -7,11 +7,12 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: db-config 7454 2007-12-11 18:55:00Z faiyaza $ +# $Id$ # $HeadURL$ from plc_config import PLCConfiguration import sys +import resource def main(): cfg = PLCConfiguration() @@ -80,6 +81,213 @@ def main(): AddRoleToPerson(10, admin['person_id']) AddRoleToPerson(20, admin['person_id']) + #################### node tags + default_node_types = [ + { 'tagname' : 'arch', + 'description' : 'architecture name', + 'category' : 'node/config', + 'min_role_id' : 40} , + { 'tagname' : 'pldistro', + 'description' : 'PlanetLab distribution', + 'category' : 'node/config', + 'min_role_id' : 10} , + { 'tagname' : 'deployment', + 'description' : 'typically "alpha", "beta", or "production"', + 'category' : 'node/operation', + 'min_role_id' : 10} , + ] + + #################### interface settings + + # Setup default slice attribute types + default_setting_types = [ + {'category' : "interface/general", + 'tagname' : "ifname", + 'description': "Set interface name, instead of eth0 or the like", + 'min_role_id' : 40}, + {'category' : "interface/multihome", + 'tagname' : "alias", + 'description': "Specifies that the network is used for multihoming", + 'min_role_id' : 40}, + + {'category' : "interface/hidden", + 'tagname' : "backdoor", + 'description': "For testing new settings", + 'min_role_id' : 10}, + ] + [ + { 'category' : "interface/wifi", + 'tagname' : x, + 'description' : "802.11 %s -- see %s"%(y,z), + 'min_role_id' : 40 } for (x,y,z) in [ + ("mode","Mode","iwconfig"), + ("essid","ESSID","iwconfig"), + ("nw","Network Id","iwconfig"), + ("freq","Frequency","iwconfig"), + ("channel","Channel","iwconfig"), + ("sens","sensitivity threshold","iwconfig"), + ("rate","Rate","iwconfig"), + ("key","key","iwconfig key"), + ("key1","key1","iwconfig key [1]"), + ("key2","key2","iwconfig key [2]"), + ("key3","key3","iwconfig key [3]"), + ("key4","key4","iwconfig key [4]"), + ("securitymode","Security mode","iwconfig enc"), + ("iwconfig","Additional parameters to iwconfig","ifup-wireless"), + ("iwpriv","Additional parameters to iwpriv","ifup-wireless"), + ] + ] + + #################### slice attributes + + # Setup default slice attribute types + default_attribute_types = [ + # Slice type (only vserver is supported) + {'tagname': "type", + 'description': "Type of slice (e.g. vserver)", + 'category' : 'slice/general', + 'min_role_id': 20}, + + # System slice + {'tagname': "system", + 'description': "Is a default system slice (1) or not (0 or unset)", + 'category' : 'slice/general', + 'min_role_id': 10}, + + # Slice enabled (1) or suspended (0) + {'tagname': "enabled", + 'description': "Slice enabled (1 or unset) or suspended (0)", + 'category' : 'slice/general', + 'min_role_id': 10}, + + # Slice reference image + {'tagname': "vref", + 'description': "Reference image", + 'category' : 'slice/config', + 'min_role_id': 30}, + + # Slice initialization script + {'tagname': "initscript", + 'description': "Slice initialization script", + 'category' : 'slice/config', + 'min_role_id': 10}, + + # CPU share + {'tagname': "cpu_pct", + 'description': "Reserved CPU percent", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + {'tagname': "cpu_share", + 'description': "Number of CPU shares", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + + # Bandwidth limits + {'tagname': "net_min_rate", + 'description': "Minimum bandwidth (kbps)", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + {'tagname': "net_max_rate", + 'description': "Maximum bandwidth (kbps)", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + {'tagname': "net_i2_min_rate", + 'description': "Minimum bandwidth over I2 routes (kbps)", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + {'tagname': "net_i2_max_rate", + 'description': "Maximum bandwidth over I2 routes (kbps)", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + {'tagname': "net_max_kbyte", + 'description': "Maximum daily network Tx KByte limit.", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + {'tagname': "net_thresh_kbyte", + 'description': "KByte limit before warning and throttling.", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + {'tagname': "net_i2_max_kbyte", + 'description': "Maximum daily network Tx KByte limit to I2 hosts.", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + {'tagname': "net_i2_thresh_kbyte", + 'description': "KByte limit to I2 hosts before warning and throttling.", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + {'tagname': "net_share", + 'description': "Number of bandwidth shares", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + {'tagname': "net_i2_share", + 'description': "Number of bandwidth shares over I2 routes", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + + # Disk quota + {'tagname': "disk_max", + 'description': "Disk quota (1k disk blocks)", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + + # Proper operations + {'tagname': "proper_op", + 'description': "Proper operation (e.g. bind_socket)", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + + # VServer capabilities + {'tagname': "capabilities", + 'description': "VServer bcapabilities (separate by commas)", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + + # Vsys + {'tagname': "vsys", + 'description': "Bind vsys script fd's to a slice's vsys directory.", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + + # CoDemux + {'tagname': "codemux", + 'description': "Demux HTTP between slices using localhost ports. Value in the form 'host, localhost port'.", + 'category' : 'slice/rspec', + 'min_role_id': 10}, + + # Delegation + {'tagname': "delegations", + 'description': "Coma seperated list of slices to give delegation authority to.", + 'category' : 'slice/rspec', + 'min_role_id': 10} + + ] + + # add in the platform supported rlimits to the default_attribute_types + 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 = { + 'tagname': "%s_%s"%(rlim,ty), + 'description': "Per sliver RLIMIT %s_%s."%(rlim,ty), + 'category': 'slice/limit', + 'min_role_id': 10 #admin + } + default_attribute_types.append(attribute) + + # Get list of existing tag types + known_tag_types = [tag_type['tagname'] for tag_type in GetTagTypes()] + + all_default_types = default_node_types + default_setting_types + default_attribute_types + # Create/update default slice tag types + for default_tag_type in all_default_types: + if default_tag_type['tagname'] not in known_tag_types: + AddTagType(default_tag_type) + else: + UpdateTagType(default_tag_type['tagname'], default_tag_type) + + #################### conf files + # Setup default PlanetLabConf entries default_conf_files = [ # NTP configuration @@ -170,16 +378,27 @@ def main(): # YUM configuration {'enabled': True, - 'source': 'PlanetLabConf/yum.conf.php?gpgcheck=1', + 'source': 'yum/myplc.repo.php?gpgcheck=1', + 'dest': '/etc/yum.myplc.d/myplc.repo', + 'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root', + 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, + 'source': 'yum/yum.conf', 'dest': '/etc/yum.conf', - 'file_permissions': '644', - 'file_owner': 'root', - 'file_group': 'root', - 'preinstall_cmd': '', - 'postinstall_cmd': '', - 'error_cmd': '', + 'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root', + 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', + 'ignore_cmd_errors': False, + 'always_update': False}, + {'enabled': True, + 'source': 'yum/stock.repo', + 'dest': '/etc/yum.myplc.d/stock.repo', + 'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root', + 'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '', 'ignore_cmd_errors': False, 'always_update': False}, + {'enabled': True, 'source': 'PlanetLabConf/delete-rpm-list-production', 'dest': '/etc/planetlab/delete-rpm-list', @@ -280,17 +499,6 @@ def main(): 'always_update': False}, # Firewall configuration - {'enabled': True, - 'source': 'PlanetLabConf/iptables', - 'dest': '/etc/sysconfig/iptables', - 'file_permissions': '600', - 'file_owner': 'root', - 'file_group': 'root', - 'preinstall_cmd': '', - 'postinstall_cmd': '', - 'error_cmd': '', - 'ignore_cmd_errors': False, - 'always_update': False}, {'enabled': True, 'source': 'PlanetLabConf/blacklist.php', 'dest': '/etc/planetlab/blacklist', @@ -393,7 +601,7 @@ def main(): # sudo configuration {'enabled': True, - 'source': 'PlanetLabConf/sudoers', + 'source': 'PlanetLabConf/sudoers.php', 'dest': '/etc/sudoers', 'file_permissions': '440', 'file_owner': 'root', @@ -422,105 +630,8 @@ def main(): conf_file = conf_files[default_conf_file['dest']] UpdateConfFile(conf_file['conf_file_id'], default_conf_file) - # Setup default slice attribute types - default_attribute_types = [ - # Slice type (only vserver is supported) - {'name': "type", - 'description': "Type of slice (e.g. vserver)", - 'min_role_id': 20}, - - # System slice - {'name': "system", - 'description': "Is a default system slice (1) or not (0 or unset)", - 'min_role_id': 10}, - - # Slice enabled (1) or suspended (0) - {'name': "enabled", - 'description': "Slice enabled (1 or unset) or suspended (0)", - 'min_role_id': 10}, - - # Slice reference image - {'name': "vref", - 'description': "Reference image", - 'min_role_id': 30}, - - # Slice initialization script - {'name': "initscript", - 'description': "Slice initialization script", - 'min_role_id': 10}, - - # CPU share - {'name': "cpu_pct", - 'description': "Reserved CPU percent", - 'min_role_id': 10}, - {'name': "cpu_share", - 'description': "Number of CPU shares", - 'min_role_id': 10}, - - # Bandwidth limits - {'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': "net_i2_max_rate", - 'description': "Maximum bandwidth over I2 routes (kbps)", - 'min_role_id': 10}, - {'name': "net_max_kbyte", - 'description': "Maximum daily network Tx KByte limit.", - 'min_role_id': 10}, - {'name': "net_thresh_kbyte", - 'description': "KByte limit before warning and throttling.", - 'min_role_id': 10}, - {'name': "net_i2_max_kbyte", - 'description': "Maximum daily network Tx KByte limit to I2 hosts.", - 'min_role_id': 10}, - {'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)", - 'min_role_id': 10}, - - # Proper operations - {'name': "proper_op", - 'description': "Proper operation (e.g. bind_socket)", - 'min_role_id': 10}, - # VServer capabilities - {'name': "capabilities", - 'description': "VServer bcapabilities (separate by commas)", - 'min_role_id': 10}, - - # Vsys - {'name': "vsys", - 'description': "Bind vsys script fd's to a slice's vsys directory.", - 'min_role_id': 10} - - ] - - # Get list of existing attribute types - attribute_types = GetSliceAttributeTypes() - attribute_types = [attribute_type['name'] for attribute_type in attribute_types] - - # Create/update default slice attribute types - for default_attribute_type in default_attribute_types: - if default_attribute_type['name'] not in attribute_types: - AddSliceAttributeType(default_attribute_type) - else: - UpdateSliceAttributeType(default_attribute_type['name'], default_attribute_type) + #################### initscripts # Default Initscripts default_initscripts = [] @@ -532,7 +643,7 @@ def main(): file = open(root + "/" + f, "ro") default_initscripts.append({"name": plc['slice_prefix'] + "_" + f, "enabled": True, - "script": file.read()}) + "script": file.read().replace("@SITE@", url).replace("@PREFIX@", plc['slice_prefix'])}) file.close() # Get list of existing initscripts @@ -542,82 +653,25 @@ def main(): for initscript in default_initscripts: if initscript['name'] not in oldinitscripts: AddInitScript(initscript) - # Setup default slice attribute types - default_setting_types = [ - - {'category' : "general", - 'name' : "ifname", - 'description': "Set interface name, instead of eth0 or the like", - 'min_role_id' : 40}, - {'category' : "general", - 'name' : "driver", - 'description': "Use this to specify an alternate driver", - 'min_role_id' : 40 }, - {'category' : "general", - 'name' : "alias", - 'description': "Allows to reuse an interface as eth0:alias", - 'min_role_id' : 40}, - - {'category' : "hidden", - 'name' : "backdoor", - 'description': "For testing new settings", - 'min_role_id' : 10}, - ] + [ - { "category" : "WiFi", - "name" : x, - "description" : "802.11 %s -- see %s"%(y,z), - "min_role_id" : 40 } for (x,y,z) in [ - ("mode","Mode","iwconfig"), - ("essid","ESSID","iwconfig"), - ("nw","Network Id","iwconfig"), - ("freq","Frequency","iwconfig"), - ("channel","Channel","iwconfig"), - ("sens","sensitivity threshold","iwconfig"), - ("rate","Rate","iwconfig"), - ("key","key","iwconfig key"), - ("key1","key1","iwconfig key [1]"), - ("key2","key2","iwconfig key [2]"), - ("key3","key3","iwconfig key [3]"), - ("key4","key4","iwconfig key [4]"), - ("securitymode","Security mode","iwconfig enc"), - ("iwconfig","Additional parameters to iwconfig","ifup-wireless"), - ("iwpriv","Additional parameters to iwpriv","ifup-wireless"), - ] - ] - - - # Get list of existing attribute types - setting_types = GetNodeNetworkSettingTypes() - setting_types = [setting_type['name'] for setting_type in setting_types] - - # Create/update default slice setting types - for default_setting_type in default_setting_types: - if default_setting_type['name'] not in setting_types: - AddNodeNetworkSettingType(default_setting_type) - else: - UpdateNodeNetworkSettingType(default_setting_type['name'], default_setting_type) - # Create/update system slices default_slices = [ # PlanetFlow {'name': plc['slice_prefix'] + "_netflow", - 'description': "PlanetFlow Traffic Auditing Service", + 'description': "PlanetFlow Traffic Auditing Service. Logs, captured in the root context using fprobe-ulogd, are stored in a directory in the root context which is bind mounted to the planetflow slice. The Planetflow Central service then periodically rsyncs these logs from the planetflow slice for aggregation.", 'url': url, 'instantiation': "plc-instantiated", # Renew forever (minus one day, work around date conversion weirdness) - 'expires': sys.maxint - (60 * 60 * 24), + 'expires': 0x7fffffff - (60 * 60 * 24), 'attributes': [('system', "1"), ('vref', "planetflow"), - ('proper_op', "open file=/etc/passwd, flags=r"), - ('proper_op', "create_socket"), - ('proper_op', "bind_socket")]}, + ('vsys', "pfmount")]}, # Sirius {'name': plc['slice_prefix'] + "_sirius", 'description': 'The Sirius Calendar Service.\n\nSirius provides system-wide reservations of 25% CPU and 2Mb/s outgoing\nbandwidth. Sign up for hour-long slots using the Web GUI at the\nPlanetLab website.\n\nThis slice should not generate traffic external to PlanetLab.\n', - 'url': url, + 'url': url + "db/sirius/index.php", 'instantiation': "plc-instantiated", # Renew forever (minus one day, work around date conversion weirdness) - 'expires': sys.maxint - (60 * 60 * 24), + 'expires': 0x7fffffff - (60 * 60 * 24), 'attributes': [('system', "1"), ('net_min_rate', "2000"), ('cpu_pct', "25"), @@ -638,16 +692,19 @@ def main(): if slice['slice_attribute_ids']: # Delete unknown attributes for slice_attribute in GetSliceAttributes(slice['slice_attribute_ids']): - if (slice_attribute['name'], slice_attribute['value']) \ + if (slice_attribute['tagname'], slice_attribute['value']) \ not in default_slice['attributes']: DeleteSliceAttribute(slice_attribute['slice_attribute_id']) else: - slice_attributes.append((slice_attribute['name'], slice_attribute['value'])) + slice_attributes.append((slice_attribute['tagname'], slice_attribute['value'])) for (name, value) in default_slice['attributes']: if (name, value) not in slice_attributes: AddSliceAttribute(slice['name'], name, value) + + #################### body for messages + installfailed = """ Once the node meets these requirements, please reinitiate the install by visiting: @@ -670,6 +727,8 @@ username %(email)s by visiting: https://%(PLC_WWW_HOST)s:%(PLC_WWW_SSL_PORT)d/db/persons/register.php?id=%(person_id)d&key=%(verification_key)s +You must wait for this account to be approved before you can begin using it, please be patient. + If you did not register for a %(PLC_NAME)s account, please ignore this message, or contact %(PLC_NAME)s Support <%(PLC_MAIL_SUPPORT_ADDRESS)s>. """ @@ -891,6 +950,7 @@ message, please reply so that we may investigate the problem. if not messages: AddMessage(template) + #################### PCUs ### Setup Initial PCU information pcu_types = [{'model': 'AP79xx', @@ -1018,6 +1078,40 @@ message, please reply so that we may investigate the problem. for ptype in protocol_types: AddPCUProtocolType(id, ptype) + default_boot_states = [ + 'boot', + 'failboot', + 'safeboot', + 'install', + 'reinstall', + 'disabled', + ] + current_boot_states = GetBootStates() + for state in default_boot_states: + if state not in current_boot_states: + AddBootState(state) + + # TODO: Delete old boot states. + # NOTE: Only do this if all federating peers have the new default boot states above. + #for state in current_boot_states: + # if state not in default_boot_states: + # DeleteBootState(state) + + # 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()