Commit bc6d3fc6 authored by Julien Muchembled's avatar Julien Muchembled

erp5: make instance*.cfg extendable

parent 40ff9f11
...@@ -213,7 +213,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0 ...@@ -213,7 +213,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
# 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 = c54e4918aacce2c0099384509801a2e7 md5sum = 77e6819ded20747d7f2fb6991d568f48
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
......
...@@ -197,20 +197,19 @@ script = ...@@ -197,20 +197,19 @@ script =
args += map("slap-connection:%%s=%%s".__mod__, args += map("slap-connection:%%s=%%s".__mod__,
self.buildout["slap-connection"].iteritems()) self.buildout["slap-connection"].iteritems())
args += ("buildout:directory=${buildout:directory}", args += ("buildout:directory=${buildout:directory}",
"buildout:installed=.installed-${:_buildout_section_name_}.cfg", "buildout:installed=.installed-${:_buildout_section_name_}.cfg")
'-oc', self.options[software_type]) buildout = self.options[software_type]
subprocess.check_call(args) # Options.get (from zc.buildout) should deserialize.
try: override = self.options["override"][software_type]
except (KeyError, TypeError): pass
else: args.append("buildout:extends=" + buildout); buildout = override
subprocess.check_call(args + ["-oc", buildout])
update_script = ${:script} update_script = ${:script}
slapos_promise = slapos_promise =
slapos_update_promise = ${:slapos_promise} slapos_update_promise = ${:slapos_promise}
override = {{ dumps(override_switch_softwaretype |default) }}
default = ${dynamic-template-erp5:rendered} default = ${dynamic-template-erp5:rendered}
# BBB
cluster = ${dynamic-template-erp5-cluster:rendered}
cluster-zope = ${dynamic-template-cluster-zope:rendered}
# Common misspelling for "default".
RootSoftwareInstance = ${dynamic-template-erp5-RootSoftwareInstance:rendered}
kumofs = ${dynamic-template-kumofs:rendered} kumofs = ${dynamic-template-kumofs:rendered}
cloudooo = ${dynamic-template-cloudooo:rendered} cloudooo = ${dynamic-template-cloudooo:rendered}
mariadb = ${dynamic-template-mariadb:rendered} mariadb = ${dynamic-template-mariadb:rendered}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment