kvm: wait until novnc certificate is generated before start websockify service

139a2d9c · Alain Takoudjou · 6112dc22 · 139a2d9c · 139a2d9c
Commit 139a2d9c authored Jan 11, 2019 by Alain Takoudjou
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

software/kvm/instance-kvm.cfg.jinja2 software/kvm/instance-kvm.cfg.jinja2 +3 -0

software/kvm/software.cfg software/kvm/software.cfg +1 -1

No files found.
--- a/software/kvm/instance-kvm.cfg.jinja2
+++ b/software/kvm/instance-kvm.cfg.jinja2
@@ -283,6 +283,9 @@ recipe = slapos.cookbook:wrapper
 command-line = ${websockify-sighandler:wrapper-path}
 wrapper-path = ${directory:services}/websockify
 hash-files = ${buildout:directory}/software_release/buildout.cfg
+wait-for-files =
+  ${ca-novnc:key-file}
+  ${ca-novnc:cert-file}
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority

--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
@@ -99,7 +99,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 1c58191b69c3e140dd9700e86195650a
+md5sum = b4a95f8398dac8de58254899b4545439
 download-only = true
 on-update = true