Commit 05800615 authored by Łukasz Nowak's avatar Łukasz Nowak

Update Release Candidate

parents e97e6a2a e752779e
...@@ -17,6 +17,10 @@ extends = ...@@ -17,6 +17,10 @@ extends =
parts = parts =
fluentbit-plugin-wendelin fluentbit-plugin-wendelin
[fluentbit-plugin-wendelin]
url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/0.3.1/fluentbit-plugin-wendelin-0.3.1.tar.gz
md5sum = 7bafdcbeb2bf9634e041fde95b63b51f
[golang1.17] [golang1.17]
# Using "./make.bash" instead of "./all.bash" disables golang tests. Some of these tests attempt to use the network, which fails on OBS' VM. # Using "./make.bash" instead of "./all.bash" disables golang tests. Some of these tests attempt to use the network, which fails on OBS' VM.
# A less radical way to fix the issue may be investigated in the future. # A less radical way to fix the issue may be investigated in the future.
......
...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages ...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '1.0.291' version = '1.0.297'
name = 'slapos.cookbook' name = 'slapos.cookbook'
long_description = open("README.rst").read() long_description = open("README.rst").read()
...@@ -131,6 +131,8 @@ setup(name=name, ...@@ -131,6 +131,8 @@ setup(name=name,
'publish-early = slapos.recipe.publish_early:Recipe', 'publish-early = slapos.recipe.publish_early:Recipe',
'publishsection = slapos.recipe.publish:PublishSection', 'publishsection = slapos.recipe.publish:PublishSection',
'publishurl = slapos.recipe.publishurl:Recipe', 'publishurl = slapos.recipe.publishurl:Recipe',
'publish_failsafe = slapos.recipe.publish:RecipeFailsafe',
'publish.serialised_failsafe = slapos.recipe.publish:SerialisedFailsafe',
'random.time = slapos.recipe.random:Time', 'random.time = slapos.recipe.random:Time',
'random.integer = slapos.recipe.random:Integer', 'random.integer = slapos.recipe.random:Integer',
'readline = slapos.recipe.readline:Recipe', 'readline = slapos.recipe.readline:Recipe',
......
...@@ -29,10 +29,12 @@ import zc.buildout ...@@ -29,10 +29,12 @@ import zc.buildout
from slapos.recipe.librecipe import wrap from slapos.recipe.librecipe import wrap
from slapos.recipe.librecipe import GenericSlapRecipe from slapos.recipe.librecipe import GenericSlapRecipe
import six import six
import os
CONNECTION_PARAMETER_STRING = 'connection-' CONNECTION_PARAMETER_STRING = 'connection-'
class Recipe(GenericSlapRecipe): class Recipe(GenericSlapRecipe):
return_list = []
def __init__(self, buildout, name, options): def __init__(self, buildout, name, options):
super(Recipe, self).__init__(buildout, name, options) super(Recipe, self).__init__(buildout, name, options)
# Tell buildout about the sections we will access during install. # Tell buildout about the sections we will access during install.
...@@ -55,7 +57,7 @@ class Recipe(GenericSlapRecipe): ...@@ -55,7 +57,7 @@ class Recipe(GenericSlapRecipe):
for k in publish: for k in publish:
publish_dict[k] = section[k] publish_dict[k] = section[k]
self._setConnectionDict(publish_dict, self.options.get('-slave-reference')) self._setConnectionDict(publish_dict, self.options.get('-slave-reference'))
return [] return self.return_list
def _setConnectionDict(self, publish_dict, slave_reference=None): def _setConnectionDict(self, publish_dict, slave_reference=None):
return self.setConnectionDict(publish_dict, slave_reference) return self.setConnectionDict(publish_dict, slave_reference)
...@@ -65,6 +67,32 @@ class Serialised(Recipe): ...@@ -65,6 +67,32 @@ class Serialised(Recipe):
return super(Serialised, self)._setConnectionDict(wrap(publish_dict), slave_reference) return super(Serialised, self)._setConnectionDict(wrap(publish_dict), slave_reference)
class Failsafe(object):
def _setConnectionDict(self, publish_dict, slave_reference):
error_status_file = self.options.get('-error-status-file')
if error_status_file:
self.return_list = [error_status_file]
else:
self.return_list = []
try:
super(Failsafe, self)._setConnectionDict(publish_dict, slave_reference)
except Exception:
if error_status_file is not None:
with open(error_status_file, 'w') as fh:
fh.write('')
else:
if error_status_file is not None:
if os.path.exists(error_status_file):
os.unlink(error_status_file)
class RecipeFailsafe(Failsafe, Recipe):
pass
class SerialisedFailsafe(Failsafe, Serialised):
pass
class PublishSection(GenericSlapRecipe): class PublishSection(GenericSlapRecipe):
""" """
......
...@@ -21,7 +21,7 @@ md5sum = 23c15a579b66cef866b30a2f53b1b737 ...@@ -21,7 +21,7 @@ md5sum = 23c15a579b66cef866b30a2f53b1b737
[instance_html5as] [instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in _update_hash_filename_ = instance_html5as.cfg.in
md5sum = 0b16e9a2cac16668e100687f19430b1e md5sum = d1b5747c064a752d7a6b09060604aa0a
[template_nginx_conf] [template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in _update_hash_filename_ = templates/nginx_conf.in
......
...@@ -142,7 +142,7 @@ recipe = slapos.recipe.build ...@@ -142,7 +142,7 @@ recipe = slapos.recipe.build
# it will be automatically removed at the beginning of "install". # it will be automatically removed at the beginning of "install".
location = ${directory:srv}/html5as location = ${directory:srv}/html5as
# All the keys in this section will be available as a dict called "self.options" # All the keys in this section will be available as a dict called "self.options"
archive = {{ '${downloader:destination}' if parameter_dict['download_url'] else '' }} archive = {{ '${downloader:target}' if parameter_dict['download_url'] else '' }}
default_index_html = ${default_index_html:output} default_index_html = ${default_index_html:output}
# If a tarball is passed as a parameter in download url # If a tarball is passed as a parameter in download url
# it's content will be served by the instance. # it's content will be served by the instance.
......
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = a0a375dcd29a21ef121931f40e5e6d51 md5sum = e0f4847f08e0062ea5a6ba492318afc7
[instance-profile] [instance-profile]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 4c7aa7b2132dc13ddee37fb416decf81 md5sum = a6061e8bea111d96c10223f9b201ecc0
...@@ -84,7 +84,10 @@ output = $${:wrapper-path} ...@@ -84,7 +84,10 @@ output = $${:wrapper-path}
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
ipv4 = mqtt://${mosquitto-config-file:ipv4}:${mosquitto-config-file:port} ipv4 = ${mosquitto-config-file:ipv4}
ipv6 = mqtt://${mosquitto-config-file:ipv6}:${mosquitto-config-file:port} ipv6 = ${mosquitto-config-file:ipv6}
port = ${mosquitto-config-file:port}
ipv4-url = mqtt://${mosquitto-config-file:ipv4}:${mosquitto-config-file:port}
ipv6-url = mqtt://${mosquitto-config-file:ipv6}:${mosquitto-config-file:port}
username = ${mosquitto-password:username} username = ${mosquitto-password:username}
password = ${mosquitto-password:passwd} password = ${mosquitto-password:passwd}
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"type": "string" "type": "string"
}, },
"administrator": { "administrator": {
"title":"Administrator", "title": "Administrator",
"description": "Who is behind the instance? A single person? A non profit?", "description": "Who is behind the instance? A single person? A non profit?",
"default": "", "default": "",
"type": "string" "type": "string"
......
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