Commit 00475e7e authored by Julien Muchembled's avatar Julien Muchembled

fixup! request: drop redundant 'config' & 'sla' options

Sorry everyone for this mistake.
parent f01d86f9
......@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import glob
import os
version = '0.91'
version = '0.92'
name = 'slapos.cookbook'
long_description = open("README.txt").read() + "\n" + \
open("CHANGES.txt").read() + "\n"
......
......@@ -107,10 +107,10 @@ class Recipe(object):
if 'config' in options or 'sla' in options:
raise UserError("'config' & 'sla' options are obsolete."
" Clean up your software release.")
filter_kw = {k: v
filter_kw = {k[4:]: v
for k, v in options.iteritems()
if k.startswith('sla-') and v}
partition_parameter_kw = self._filterForStorage({k: v
partition_parameter_kw = self._filterForStorage({k[7:]: v
for k, v in options.iteritems()
if k.startswith('config-')})
slave = options.get('slave', 'false').lower() in \
......
......@@ -126,6 +126,6 @@ Jinja2 = 2.6
# ... And newer s.r.template requires Jinja2 >= 2.7
slapos.recipe.template = 2.4.2
rdiff-backup = 1.3.4nxd2
slapos.cookbook = 0.91
slapos.cookbook = 0.92
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