Revert "switch-softwaretype: copy the slap-configuration values"

This reverts commit 69d7b336.

setup.py

@@ -155,7 +155,6 @@ setup(name=name,
           'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
           'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
           'switch-softwaretype = slapos.recipe.switch_softwaretype:Recipe',
-          'switch-softwaretype.noop = slapos.recipe.switch_softwaretype:NoOperation',
           'symbolic.link = slapos.recipe.symbolic_link:Recipe',
           'tidstorage = slapos.recipe.tidstorage:Recipe',
           'trac = slapos.recipe.trac:Recipe',

slapos/recipe/switch_softwaretype.py

@@ -55,9 +55,6 @@ class SubBuildout(Buildout):
     # Use same slap connection
     for k, v in main_buildout["slap-connection"].items():
       options.append(('slap-connection', k, v))
-    for k, v in main_buildout["slap-configuration"].items():
-      options.append(('slap-configuration', k, v))
-    options.append(('slap-configuration', 'recipe', 'switch-softwaretype.noop'))
 
     Buildout.__init__(self, config, options, **kwargs)
 
@@ -125,14 +122,3 @@ class Recipe:
     sub_buildout.install([])
 
   update = install
-
-class NoOperation:
-  def __init__(self, buildout, name, options):
-    self.buildout = buildout
-    self.options = options
-    self.name = name
-
-  def install(self):
-      return []
-
-  update = install
\ No newline at end of file