re6stnet: softwaretype -> switch-softwaretype

software/re6stnet/buildout.hash.cfg

@@ -14,11 +14,11 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = eea691b0919812b9717f17005f06681d
+md5sum = 99e8d2b0a0a937ca21d449b542fd8f45
 
 [template-re6stnet]
 filename = instance-re6stnet.cfg.in
-md5sum = 066c1e4e0b97a39bd40da56622921791
+md5sum = 0a5e61e126ed5138e8d04fbb7670ae95
 
 [template-apache-conf]
 filename = apache.conf.in

software/re6stnet/instance-re6stnet.cfg.in

@@ -118,7 +118,7 @@ key-file = ${re6st-registry-conf-dict:key}
 cert-file = ${re6st-registry-conf-dict:ca}
 dh-file = ${re6st-registry-conf-dict:dh}
 
-slave-instance-list = ${slap-parameter:slave_instance_list}
+slave-instance-list = {{ slapparameter_dict.get('slave_instance_list', '{}') }}
 
 environment =
   PATH={{ openssl_bin }}
@@ -194,10 +194,3 @@ parts =
   re6st-registry-promise
   apache-registry-promise
   monitor-base
-
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-offline = true
-
-[slap-parameter]
-slave_instance_list = {}

software/re6stnet/instance.cfg.in

@@ -16,8 +16,6 @@ recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
 extra-context =
 context =
-    key develop_eggs_directory buildout:develop-eggs-directory
-    key eggs_directory buildout:eggs-directory
     key ipv6_set slap-configuration:ipv6
     key ipv4_set slap-configuration:ipv4
     key slapparameter_dict slap-configuration:configuration
@@ -43,7 +41,9 @@ extra-context =
     raw monitor2_template_rendered {{ monitor2_template_rendered }}
 
 [switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
+recipe = slapos.cookbook:switch-softwaretype
 
-default = ${dynamic-template-re6stnet:rendered}
+default = dynamic-template-re6stnet:rendered
 registry = ${:default}
+# BBB
+RootSoftwareInstance = ${:default}