Merge branch 'master' into funcaspect

[plcapi.git] / db-config.d / 010-slice_tags

diff --git a/db-config.d/010-slice_tags b/db-config.d/010-slice_tags
index 040fa60..535c735 100644 (file)
--- a/db-config.d/010-slice_tags
+++ b/db-config.d/010-slice_tags
@@ -36,6 +36,9 @@ slicetag_types = \
     {'tagname': "cpu_share",
      'description': "Number of CPU shares",
      'category' : 'slice/rspec'},
+    {'tagname': "cpu_cores",
+     'description': "Number of CPU cores",
+     'category': 'slice/rspec'},
     
     # Bandwidth limits
     {'tagname': "net_min_rate",
@@ -118,6 +121,7 @@ slicetag_types = \
 
 ]
 
+import resource
 # add in the platform supported rlimits to the default_attribute_types
 for entry in resource.__dict__.keys() + ["VLIMIT_OPENFD"]:
     if entry.find("LIMIT_")==1: