Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos
Commits
3a936da2
Commit
3a936da2
authored
Jul 07, 2014
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: Add support for legacy default software_type value.
Also, remove dead section "cluster".
parent
ed98260e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+2
-4
No files found.
stack/erp5/buildout.cfg
View file @
3a936da2
...
@@ -230,7 +230,7 @@ md5sum = ba1b23177e101b5b9f03e1c5009c81fc
...
@@ -230,7 +230,7 @@ md5sum = ba1b23177e101b5b9f03e1c5009c81fc
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
95f85fdc55e70937eac39bbfe32042c
f
md5sum =
ed053189e234a27f0b2f2b8b53c532b
f
extra-context =
extra-context =
key mariadb_link_binary template-mariadb:link-binary
key mariadb_link_binary template-mariadb:link-binary
key zope_link_binary template-zope:link-binary
key zope_link_binary template-zope:link-binary
...
...
stack/erp5/instance.cfg.in
View file @
3a936da2
...
@@ -75,10 +75,6 @@ extra-context =
...
@@ -75,10 +75,6 @@ extra-context =
key software_type :software-type
key software_type :software-type
software-type = default
software-type = default
[dynamic-template-erp5-cluster]
< = dynamic-template-erp5
software-type = cluster
[dynamic-template-erp5-RootSoftwareInstance]
[dynamic-template-erp5-RootSoftwareInstance]
< = dynamic-template-erp5
< = dynamic-template-erp5
software-type = RootSoftwareInstance
software-type = RootSoftwareInstance
...
@@ -244,6 +240,8 @@ override = {{ dumps(override_switch_softwaretype |default) }}
...
@@ -244,6 +240,8 @@ override = {{ dumps(override_switch_softwaretype |default) }}
# Public software types
# Public software types
default = ${dynamic-template-erp5:rendered}
default = ${dynamic-template-erp5:rendered}
create-erp5-site = ${dynamic-template-create-erp5-site:rendered}
create-erp5-site = ${dynamic-template-create-erp5-site:rendered}
# BBB: Legacy software types, aliased to "default"
RootSoftwareInstance = ${dynamic-template-erp5-RootSoftwareInstance:rendered}
# Internal software types
# Internal software types
kumofs = ${dynamic-template-kumofs:rendered}
kumofs = ${dynamic-template-kumofs:rendered}
cloudooo = ${dynamic-template-cloudooo:rendered}
cloudooo = ${dynamic-template-cloudooo:rendered}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment