.

software/ors-amarisoft/instance-ors.cfg

@@ -2,6 +2,24 @@
 extends =
   $${template-base:output}
 
+[switch-softwaretype]
+enb = dynamic-template-ors-enb:output
+gnb = dynamic-template-ors-gnb:output
+obsolete = dynamic-template-obsolete:output
+enb-epc = $${:obsolete}
+gnb-epc = $${:obsolete}
+epc = $${:obsolete}
+mme = $${:obsolete}
+ue =
+
+[dynamic-template-obsolete]
+< = jinja2-template-base
+url = ${template-obsolete:target}
+filename = instance-obsolete.cfg
+extensions = jinja2.ext.do
+extra-context =
+    key slave_instance_list slap-configuration:slave-instance-list
+
 [ors-version]
 recipe = slapos.recipe.build
 configuration = $${slap-configuration:configuration}

software/ors-amarisoft/instance.cfg

@@ -119,23 +119,9 @@ init =
 [switch-softwaretype]
 recipe = slapos.cookbook:switch-softwaretype
 enb = dynamic-template-enb:output
-gnb = dynamic-template-gnb:output
 core-network = dynamic-template-core-network:output
 ue = dynamic-template-ue:output
 RootSoftwareInstance = $${:core-network}
-obsolete = dynamic-template-obsolete:output
-enb-epc = $${:obsolete}
-gnb-epc = $${:obsolete}
-epc = $${:obsolete}
-mme = $${:obsolete}
-
-[dynamic-template-obsolete]
-< = jinja2-template-base
-url = ${template-obsolete:target}
-filename = instance-obsolete.cfg
-extensions = jinja2.ext.do
-extra-context =
-    key slave_instance_list slap-configuration:slave-instance-list
 
 [dynamic-template-enb]
 < = jinja2-template-base

software/ors-amarisoft/software-base.cfg

@@ -66,9 +66,6 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_}
 [template-enb]
 <= download-base
 
-[template-gnb]
-<= download-base
-
 [template-core-network]
 <= download-base