Merge commit 'origin/master'

[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 9910217..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",
@@ -101,17 +104,6 @@ slicetag_types = \
      'category' : 'slice/rspec',
      'roles' : ['admin','pi','user']},
 
-    # Security capability to empower a slice to make an authenticated API call, set by silverauth NM plugin.
-    {'tagname': "hmac",
-     'description': "Sliver authorization key.",
-     'category' : 'slice/auth',
-     'roles': ['admin','pi']},
-
-    {'tagname': "ssh_key",
-     'description': "Sliver public ssh key.",
-     'category' : 'slice/auth',
-     'roles': ['admin','pi']},
-
     # Capability to give a sliver access to unused raw disk
     {'tagname': "rawdisk",
      'description': "map unused raw disk devices into the slice",
@@ -127,12 +119,9 @@ slicetag_types = \
      'description': "Is a default Distributed Rate Limiting slice (1) or not (0 or unset)",
      'category' : 'slice/general'},
 
-    # OMF controlled slice
-    {'tagname': "omf_control",
-     'description': "Pre-install and configure OMF Resource Controller in slice if set",
-     'category' : 'slice/usertools'},
 ]
 
+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: