Merge branch 'kvm-cluster'

software/kvm/common.cfg

@@ -106,7 +106,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 6ac9d1b06398b57cc1c8d63a9c492415
+md5sum = 3fc6611feaabcacd7e51f3b5681120fd
 download-only = true
 on-update = true
 

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -74,7 +74,7 @@ config-document-path = ${hash-code:passwd}
 return = 
   backend-url
   url
-{% if str(use_nat).lower() -%}
+{% if str(use_nat).lower() == 'true' -%}
 {%   for port in nat_rules_list -%}
 {{ '  ' }}nat-rule-url-{{ port }}
 {%   endfor -%}

stack/monitor/buildout.cfg

@@ -41,7 +41,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/monitor.cfg.in
 output = ${buildout:directory}/monitor.cfg
 filename = monitor.cfg
-md5sum = 4d0c3b847c18a56068f04dd926487272
+md5sum = 51284c0aeb62eccd37f8a4e1621ee28c
 mode = 0644
 
 [monitor-bin]

stack/monitor/monitor.cfg.in

@@ -263,6 +263,9 @@ recipe = slapos.cookbook:wrapper
 apache-executable = ${apache:location}/bin/httpd
 command-line = $${:apache-executable} -f $${monitor-httpd-configuration-file:rendered} -DFOREGROUND
 wrapper-path = $${ca-httpd:executable}
+wait-for-files =
+  $${cadirectory:certs}/httpd.key
+  $${cadirectory:certs}/httpd.crt
 
 [cgi-httpd-graceful-wrapper]
 recipe = slapos.recipe.template:jinja2