tweaks for removal of slice manager

[tests.git] / system / config_default.py

diff --git a/system/config_default.py b/system/config_default.py
index c68191c..4deba9a 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -66,9 +66,8 @@ def nodes(options, index):
                                           'next_hop' : 'xxx-deferred-xxx',
                                           },
              'bootmedium_options' :     [ 'serial', 'no-hangcheck', 'systemd-debug' ],
-             # provision for bonding
              'tags'               :     {
-                 'plain-bootstrapfs' : 'YES',
+                 # no tags anymore
              },
              # boot cd settings
              # we should have tags here instead of the hard-wired
@@ -390,7 +389,7 @@ def initscripts(options, index):
 # returns 3 slices
 # 1 has an initscript code
 # 2 has an initscript name
-# 3 is an omf-friendly slice
+# 3 used to be an omf-friendly slice but this is now deprecated
 def slices (options, index):
     def theslice (i):
         slice_spec = { 'slice_fields': {'name' : '{}_sl{}'.format(login_base(index),i),
@@ -412,10 +411,11 @@ def slices (options, index):
         elif i%3 == 2:
             slice_spec['initscriptname'] = 'initscript_by_name'
             slice_spec['initscriptstamp'] = 'initscript_by_name'
-        # 3rd one is omf-friendly
+        # 3rd one - not omf-friendly any longer
         else:
-            # potentially turned off with config_no_omf
-            slice_spec ['omf-friendly'] = True
+            # omf-friendly slices is a deprecated feature
+            # slice_spec ['omf-friendly'] = True
+            pass
         return slice_spec
     # usual index is 1, additional plc's then get 2...
     # so index=1 -> 1 - 2 - 3
@@ -513,8 +513,10 @@ def plc (options, index) :
             'PLC_NET_DNS2' : 'deferred-dns-2',
             'PLC_RESERVATION_GRANULARITY':1800,
             'PLC_VSYS_DEFAULTS' : ' , vif_up, vif_down, fd_tuntap, promisc, ',
-            'PLC_OMF_ENABLED' : 'true',
-            'PLC_OMF_XMPP_SERVER' : 'deferred-myplc-hostname',
+# omf-friendly slices is a deprecated feature
+#            'PLC_OMF_ENABLED' : 'true',
+#            'PLC_OMF_XMPP_SERVER' : 'deferred-myplc-hostname',
+            'PLC_OMF_ENABLED' : 'false',
         },
         'expected_vsys_tags': [ 'vif_up', 'vif_down', 'fd_tuntap', 'promisc', ],
         # minimal config so the omf plugins actually trigger
@@ -544,9 +546,6 @@ def sfa (options, index) :
             'SFA_INTERFACE_HRN' : sfa_root(index),
             'SFA_REGISTRY_HOST' : 'deferred-myplc-hostname',
             'SFA_AGGREGATE_HOST' : 'deferred-myplc-hostname',
-            'SFA_SM_HOST' : 'deferred-myplc-hostname',
-# turning off SM and using only AM; be explicit on this as the default has changed in the code
-            'SFA_SM_ENABLED' : 'false',
             'SFA_PLC_URL' : 'deferred-myplc-api-url',
             'SFA_PLC_USER' : 'root@test.onelab.eu',
             'SFA_PLC_PASSWORD' : 'test++',