Commit 44274bf8 authored by Kirill Smelkov's avatar Kirill Smelkov

Add support for collective.recipe.template

Occurs in SlapOS-node.
parent 8c2c7dee
......@@ -153,7 +153,8 @@ def bom_software(installed_software_path): # -> {} (name,kind) -> PkgInfo
raise NotImplementedError('%s uses %s with url that does not look like a .conf, archive or SR file: %s' % (s, recipe, url))
elif recipe.startswith('slapos.recipe.template'):
elif recipe.startswith('slapos.recipe.template') or \
recipe == 'collective.recipe.template':
url = geturl(part, None)
if url is not None:
if isconf(url):
......@@ -162,7 +163,10 @@ def bom_software(installed_software_path): # -> {} (name,kind) -> PkgInfo
raise ValueError('%s uses %s with url that does not look like a .conf file: %s' % (s, recipe, url))
else:
# it is an inline= script
assert 'inline' in part, part
if recipe.startswith('slapos'):
assert 'inline' in part, part
else: # collective...
assert part['input'].startswith('inline:')
elif recipe in ('zc.recipe.egg:custom', 'zc.recipe.egg:develop'):
......
......@@ -142,6 +142,12 @@ recipe = slapos.recipe.template:jinja2
url = /srv/slapgrid/slappart47/srv/project/slapos/stack/logrotate/instance-logrotate-base.cfg.in
""", '') # config ignored
case1("""\
[cfg-environment]
recipe = collective.recipe.template
input = inline: zzz
""", '') # inline ignore
case1("""\
[neoppod-develop]
......
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