Merge branch 'ipv6'

[nodemanager.git] / plugins / sliverauth.py

diff --git a/plugins/sliverauth.py b/plugins/sliverauth.py
index 69de1d9..0798650 100644 (file)
--- a/plugins/sliverauth.py
+++ b/plugins/sliverauth.py
@@ -45,10 +45,17 @@ def GetSlivers(data, config, plc):
                 logger.log("sliverauth: plc-instantiated slice %s does not yet exist. IGNORING!" % sliver['name'])
             continue
 
+        system_slice = False
         for chunk in sliver['attributes']:
-            if chunk['tagname']=='enable_hmac':
+            if chunk['tagname'] == "system":
+                if chunk['value'] in (True, 1, '1') or chunk['value'].lower() == "true":
+                    system_slice = True
+
+        for chunk in sliver['attributes']:
+            if chunk['tagname']=='enable_hmac' and not system_slice:
                 manage_hmac (plc, sliver)
-            elif chunk['tagname']=='omf_control':
+
+            if chunk['tagname']=='omf_control':
                 manage_sshkey (plc, sliver)