Post Merge fix: Add missing changes

600a2022 · Alain Takoudjou · Tristan Cavelier · af77ac19 · 600a2022
Commit 600a2022 authored Dec 05, 2014 by Alain Takoudjou Committed by Tristan Cavelier Mar 31, 2015
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 11 deletions

stack/erp5/instance.cfg.in stack/erp5/instance.cfg.in +0 -11

No files found.
--- a/stack/erp5/instance.cfg.in
+++ b/stack/erp5/instance.cfg.in
@@ -73,19 +73,8 @@ extra-context =
    key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository
    import urlparse urlparse
    key openssl_location :openssl-location
-# Must match the key id in [switch-softwaretype] which uses this section.
-    key software_type :software-type
-software-type = default
 openssl-location = {{ openssl_location }}

-[dynamic-template-erp5-RootSoftwareInstance]
-< = dynamic-template-erp5
-software-type = RootSoftwareInstance
-
-[dynamic-template-erp5-create-erp5-site]
-< = dynamic-template-erp5
-software-type = create-erp5-site
-
 [dynamic-template-balancer-parameters]
 apache = {{ apache_location }}
 openssl = {{ openssl_location }}