software/kvm: Switch to monitor-promise-base

software/kvm/buildout.hash.cfg

@@ -19,19 +19,19 @@ md5sum = 2cbfd6b08c65369c1d45cf3ba2ff335a
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = bcd3705e510da52e7ddf1e1527839642
+md5sum = 36e7a8656e52d3aace8d9e52dcb3864e
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = 352f18067714501c8ccee55f8930d245
+md5sum = 2e743132ba4e001f784791311df9ba6a
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2
-md5sum = 7d4b14660b7a30084aa7e023b0db50be
+md5sum = e50e45c3097ed5a7115817fbc967f173
 
 [template-kvm-import]
 filename = instance-kvm-import.cfg.jinja2.in
-md5sum = dc3f3ad9ebd8b3b5c3ded57b91cee9c7
+md5sum = 97a8ff8a5891678274b14481dfc5214c
 
 [template-kvm-import-script]
 filename = template/kvm-import.sh.jinja2
@@ -47,7 +47,7 @@ md5sum = b617d64de73de1eed518185f310bbc82
 
 [template-nbd]
 filename = instance-nbd.cfg.in
-md5sum = f634a5249b773658b7a7bc9fa9bb0368
+md5sum = a05b581d65768ac55faf3b06d4aec447
 
 [template-ansible-promise]
 filename = template/ansible-promise.in
@@ -79,4 +79,4 @@ md5sum = 599dbbbd438fe7801e3f8642ae9e9a78
 
 [template-httpd]
 filename = instance-kvm-http.cfg.in
-md5sum = 26a181a48046ce88570adb32334747ef
+md5sum = d657884d02105deffddee0edae4b50a6

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

@@ -229,7 +229,6 @@ log = ${:var}/log
 scripts = ${:etc}/run
 services = ${:etc}/service
 webroot = ${:srv}/document
-promises = ${:etc}/promise
 ssl = ${:etc}/ssl
 
 [directory-doc]

software/kvm/instance-kvm-http.cfg.in

@@ -14,7 +14,6 @@ public = ${:srv}/public/
 log = ${:var}/log
 services = ${:etc}/service
 scripts = ${:etc}/run
-promises = ${:etc}/promise
 run = ${:var}/run
 document = ${:srv}/document
 ssl = ${:etc}/ssl
@@ -65,7 +64,8 @@ update-command =
 stop-on-error = true
 
 [httpd-promise]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promises}/apache-httpd
-hostname = ${apache-conf:ip}
-port = ${apache-conf:port}
+<= monitor-promise-base
+module = check_port_listening
+name = apache-httpd.py
+config-hostname = ${apache-conf:ip}
\ No newline at end of file
+config-port = ${apache-conf:port}

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

@@ -41,7 +41,6 @@ var = ${buildout:directory}/var
 log = ${:var}/log
 scripts = ${:etc}/run
 services = ${:etc}/service
-promises = ${:etc}/promise
 novnc-conf = ${:etc}/novnc
 run = ${:var}/run
 ca-dir = ${:srv}/ssl
@@ -63,8 +62,7 @@ context =
 
 backup-disk-path = ${directory:backup}/virtual.qcow2
 
-[kvm-disk-image-corruption-promise]
-# Check that disk image is not corrupted
+[kvm-disk-image-corruption-bin]
 recipe = collective.recipe.template
 input = inline:#!/bin/sh
   QEMU_IMAGE="${directory:srv}/virtual.qcow2"
@@ -78,5 +76,12 @@ input = inline:#!/bin/sh
   else
     exit 1
   fi
-output = ${directory:promises}/kvm-disk-image-corruption
+output = ${directory:bin}/kvm-disk-image-corruption
 mode = 700
+
+[kvm-disk-image-corruption-promise]
+# Check that disk image is not corrupted
+<= monitor-promise-base
+module = check_command_execute
+name = kvm-disk-image-corruption.py
+config-command = ${kvm-disk-image-corruption-bin:output}

software/kvm/instance-kvm-resilient.cfg.jinja2

@@ -57,7 +57,6 @@ cors-domains = {{ monitor_parameter.get('monitor-cors-domains', '') }}
 [directory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc
-promises = ${:etc}/promise
 
 # Bubble down the parameters of the requested instance to the user
 [request-kvm]
@@ -83,21 +82,26 @@ monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
 monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}&username=${monitor-publish-parameters:monitor-user}&password=${publish-early:monitor-password}
 {% endif -%}
 
-[kvm-frontend-url-promise]
-# Check that url parameter is complete
+[kvm-frontend-url-bin]
 recipe = collective.recipe.template
 input = inline:#!/bin/sh
   URL="${request-kvm:connection-url}"
   if [[ ! "$URL" == https://* ]]; then
     exit 1
   fi
-output = ${resilient-directory:promise}/kvm-frontend-url
+output = ${directory:bin}/kvm-frontend-url
 mode = 700
 
+[kvm-frontend-url-promise]
+# Check that url parameter is complete
+<= monitor-promise-base
+module = check_command_execute
+name = kvm-frontend-url.py
+config-command = ${kvm-frontend-url-bin:output}
+
 [kvm-backend-url-promise]
 # Check that backend url is reachable
-recipe = slapos.cookbook:check_url_available
-path = ${directory:promises}/frontend_promise
-url = ${publish-connection-information:url}
-dash_path = /bin/sh
-curl_path = {{ curl_executable_location }}
+<= monitor-promise-base
+module = check_url_available
+name = frontend_promise.py
+config-url = ${publish-connection-information:url}

software/kvm/instance-kvm.cfg.jinja2

@@ -40,7 +40,6 @@ var = ${buildout:directory}/var
 log = ${:var}/log
 scripts = ${:etc}/run
 services = ${:etc}/service
-promises = ${:etc}/promise
 novnc-conf = ${:etc}/novnc
 run = ${:var}/run
 prerm = ${:etc}/prerm
@@ -216,13 +215,13 @@ command-line = ${kvm-controller:rendered}
 
 
 [kvm-vnc-promise]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promises}/vnc_promise
-hostname = ${kvm-parameter-dict:vnc-ip}
-port = ${kvm-parameter-dict:vnc-port}
+<= monitor-promise-base
+module = check_port_listening
+name = vnc_promise.py
+config-hostname = ${kvm-parameter-dict:vnc-ip}
+config-port = ${kvm-parameter-dict:vnc-port}
 
-[kvm-disk-image-corruption-promise]
-# Check that disk image is not corrupted
+[kvm-disk-image-corruption-bin]
 recipe = collective.recipe.template
 input = inline:#!/bin/sh
   # Return code 0 is "OK"
@@ -239,9 +238,16 @@ input = inline:#!/bin/sh
   else
     exit 1
   fi
-output = ${directory:promises}/kvm-disk-image-corruption
+output = ${directory:bin}/kvm-disk-image-corruption
 mode = 700
 
+[kvm-disk-image-corruption-promise]
+# Check that disk image is not corrupted
+<= monitor-promise-base
+module = check_command_execute
+name = kvm-disk-image-corruption.py
+config-command = ${kvm-disk-image-corruption-bin:output}
+
 {% if wipe_disk == 'true' -%}
 {% do part_list.append('wipe-disk-wrapper') -%}
 {% set wipe_file_list = '${kvm-parameter-dict:disk-path}' -%}
@@ -255,16 +261,22 @@ command-line =
   {{ wipe_disk_wrapper }} -n {{ slapparameter_dict.get('wipe-disk-iterations', 1) }} -suz --check-pid-file ${kvm-parameter-dict:pid-file-path} --file {{ wipe_file_list }}
 {% endif -%}
 
-[kvm-started-promise]
+[kvm-started-bin]
 recipe = slapos.recipe.template:jinja2
 template = {{ qemu_start_promise_tpl }}
-rendered = ${directory:promises}/qemu-virtual-machine-is-ready
+rendered = ${directory:bin}/qemu-virtual-machine-is-ready
 mode = 700
 context =
   raw dash {{ dash_executable_location }}
   raw qemu_ready_path ${kvm-controller-parameter-dict:kvm-status-path}
   raw qemu_service_log_file ${buildout:directory}/.${slap-connection:partition-id}_kvm.log
 
+[kvm-started-promise]
+<= monitor-promise-base
+module = check_command_execute
+name = qemu-virtual-machine-is-ready.py
+config-command = ${kvm-started-bin:rendered}
+
 [novnc-instance]
 recipe = slapos.cookbook:novnc
 path = ${ca-novnc:executable}
@@ -325,10 +337,11 @@ executable = ${directory:bin}/novnc
 wrapper = ${directory:bin}/websockify
 
 [novnc-promise]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promises}/novnc_promise
-hostname = ${novnc-instance:ip}
-port = ${novnc-instance:port}
+<= monitor-promise-base
+module = check_port_listening
+name = novnc_promise.py
+config-hostname = ${novnc-instance:ip}
+config-port = ${novnc-instance:port}
 
 
 #----------------
@@ -380,11 +393,10 @@ name = ${slap-parameter:frontend-instance-name}
 sla-instance_guid = ${slap-parameter:frontend-instance-guid}
 
 [frontend-promise]
-recipe = slapos.cookbook:check_url_available
-path = ${directory:promises}/frontend_promise
-url = ${publish-connection-information:url}
-dash_path = {{ dash_executable_location }}
-curl_path = {{ curl_executable_location }}
+<= monitor-promise-base
+module = check_url_available
+name = frontend_promise.py
+config-url = ${publish-connection-information:url}
 
 {% if additional_frontend %}
 [request-slave-frontend-additional]
@@ -395,11 +407,10 @@ name = ${slap-parameter:frontend-additional-instance-name}
 sla-instance_guid = ${slap-parameter:frontend-additional-instance-guid}
 
 [frontend-additional-promise]
-recipe = slapos.cookbook:check_url_available
-path = ${directory:promises}/frontend_additional_promise
-url = ${publish-connection-information:url-additional}
-dash_path = {{ dash_executable_location }}
-curl_path = {{ curl_executable_location }}
+<= monitor-promise-base
+module = check_url_available
+name = frontend_additional_promise.py
+config-url = ${publish-connection-information:url-additional}
 {% endif %}
 
 {% if enable_http == 'true' %}
@@ -419,10 +430,11 @@ wrapper-path = ${directory:services}/http-server
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [httpd-promise]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promises}/httpd
-hostname = ${httpd:host}
-port = ${httpd:port}
+<= monitor-promise-base
+module = check_port_listening
+name = httpd.py
+config-hostname = ${httpd:host}
+config-port = ${httpd:port}
 {% endif %}
 
 [monitor-instance-parameter]
@@ -679,15 +691,21 @@ command-line = ${tunnel-cluster-url:runner-path}
 wrapper-path = ${directory:services}/6tunnel-cluster
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
-[ansible-vm-promise]
+[ansible-vm-bin]
 recipe = slapos.recipe.template:jinja2
 template = {{ ansible_promise_tpl }}
-rendered = ${directory:promises}/ansible_{{ name }}
+rendered = ${directory:bin}/ansible_{{ name }}
 extensions = jinja2.ext.do
 context =
   raw logs ${directory:public}/ansible
   raw name {{ name }}
 
+[ansible-vm-promise]
+<= monitor-promise-base
+module = check_execute_comand
+name = ansible_{{ name }}.py
+config-command = ${ansible-vm-bin:rendered}
+
 [download-bootstrap-script]
 recipe = plone.recipe.command
 file-location = ${directory:public}/vm-bootstrap

software/kvm/instance-nbd.cfg.in

@@ -23,7 +23,6 @@ log = $${buildout:directory}/log
 recipe = slapos.cookbook:mkdirectory
 services = $${rootdirectory:etc}/run
 watched-services = $${rootdirectory:etc}/service
-promises = $${rootdirectory:etc}/promise
 
 [nbd-instance]
 recipe = slapos.cookbook:nbdserver
@@ -36,10 +35,11 @@ shell-path = ${dash:location}/bin/dash
 path = $${basedirectory:services}/nbdserver
 
 [nbd-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${basedirectory:promises}/nbd_promise
-hostname = $${nbd-instance:ip}
-port = $${nbd-instance:port}
+<= monitor-promise-base
+module = check_port_listening
+name = nbd_promise.py
+config-hostname = $${nbd-instance:ip}
+config-port = $${nbd-instance:port}
 
 [gen-passwd]
 recipe = slapos.cookbook:generate.password
@@ -58,10 +58,11 @@ path = $${basedirectory:watched-services}/onetimeupload
 key = $${gen-passwd:passwd}
 
 [onetimeupload-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${basedirectory:promises}/onetimeupload_promise
-hostname = $${onetimeupload-instance:ip}
-port = $${onetimeupload-instance:port}
+<= monitor-promise-base
+module = check_port_listening
+name = onetimeupload_promise.py
+config-hostname = $${onetimeupload-instance:ip}
+config-port = $${onetimeupload-instance:port}
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish