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

software/kvm: Pick up fixed qmpbackup

Fixes handling failed backups.
parent 28d2f48a
...@@ -43,7 +43,7 @@ md5sum = a02f0694dcb944c18d99f7f79afa2384 ...@@ -43,7 +43,7 @@ md5sum = a02f0694dcb944c18d99f7f79afa2384
[template-kvm-export-script] [template-kvm-export-script]
filename = template/kvm-export.sh.jinja2 filename = template/kvm-export.sh.jinja2
md5sum = a1da7809d547b4c61e7c6337bf9f8b8a md5sum = 3540b42e0869b409846a1601b6ea4dcc
[template-nginx] [template-nginx]
filename = template/nginx_conf.in filename = template/nginx_conf.in
......
...@@ -36,13 +36,15 @@ parts = ${:common-parts} ...@@ -36,13 +36,15 @@ parts = ${:common-parts}
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
qemu.qmp qemu.qmp
colorlog
qmpbackup qmpbackup
find-links += find-links +=
https://github.com/abbbi/qmpbackup/releases/download/v0.37/qmpbackup-0.37.tar.gz https://github.com/abbbi/qmpbackup/releases/download/v0.42/qmpbackup-0.42.tar.gz
[versions] [versions]
qemu.qmp = 0.0.3:whl qemu.qmp = 0.0.3:whl
qmpbackup = 0.37 colorlog = 6.9.0:whl
qmpbackup = 0.42
[python-with-eggs] [python-with-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
...@@ -6,6 +6,9 @@ set -e ...@@ -6,6 +6,9 @@ set -e
LC_ALL=C LC_ALL=C
export LC_ALL export LC_ALL
BACKUP_DIR={{ directory['backup'] }} BACKUP_DIR={{ directory['backup'] }}
# decolorize colorlog in qmpbackup
NO_COLOR=true
export NO_COLOR
log=$(mktemp --tmpdir={{ directory['tmp'] }}) log=$(mktemp --tmpdir={{ directory['tmp'] }})
trap "rm -f $log" EXIT TERM INT trap "rm -f $log" EXIT TERM INT
......
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