KVM promises

See merge request nexedi/slapos!1094

software/kvm/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = f2b0f1ed27148504f220e06eaceff935
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 93cbee3403e7e23b4278143c32209ddc
+md5sum = 14b5ec1ee15c8d108c67cc3e9d87e6a6
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in

software/kvm/instance-kvm.cfg.jinja2

@@ -84,7 +84,8 @@ storage-path = ${directory:srv}/tap_mac
 
 [gen-passwd]
 recipe = slapos.cookbook:generate.password
-storage-path = ${directory:srv}/passwd
+storage-path = ${directory:srv}/.passwd
+# VNC protocol supports passwords of 8 characters max
 bytes = 8
 
 {% if boot_image_url_select_enabled %}
@@ -94,10 +95,7 @@ bytes = 8
 promise = check_file_state
 name = ${:_buildout_section_name_}.py
 config-state = empty
-# It's very hard to put the username and password correctly, after schema://
-# and before the host, as it's not the way how one can use monitor provided
-# information, so just show the information in the URL
-config-url = ${monitor-base:base-url}/private/boot-image-url-select/${:filename} with username ${monitor-publish-parameters:monitor-user} and password ${monitor-publish-parameters:monitor-password}
+config-url = ${monitor-base:base-url}/private/boot-image-url-select/${:filename}
 
 [boot-image-url-select-source-config]
 recipe = slapos.recipe.template:jinja2
@@ -193,10 +191,7 @@ config-filename = ${boot-image-url-select-download-wrapper:error-state-file}
 promise = check_file_state
 name = ${:_buildout_section_name_}.py
 config-state = empty
-# It's very hard to put the username and password correctly, after schema://
-# and before the host, as it's not the way how one can use monitor provided
-# information, so just show the information in the URL
-config-url = ${monitor-base:base-url}/private/boot-image-url-list/${:filename} with username ${monitor-publish-parameters:monitor-user} and password ${monitor-publish-parameters:monitor-password}
+config-url = ${monitor-base:base-url}/private/boot-image-url-list/${:filename}
 
 [boot-image-url-list-source-config]
 recipe = slapos.recipe.template:jinja2
@@ -292,10 +287,7 @@ config-filename = ${boot-image-url-list-download-wrapper:error-state-file}
 promise = check_file_state
 name = ${:_buildout_section_name_}.py
 config-state = empty
-# It's very hard to put the username and password correctly, after schema://
-# and before the host, as it's not the way how one can use monitor provided
-# information, so just show the information in the URL
-config-url = ${monitor-base:base-url}/private/virtual-hard-drive-url/${:filename} with username ${monitor-publish-parameters:monitor-user} and password ${monitor-publish-parameters:monitor-password}
+config-url = ${monitor-base:base-url}/private/virtual-hard-drive-url/${:filename}
 
 [virtual-hard-drive-url-source-config]
 recipe = slapos.recipe.template:jinja2
@@ -768,7 +760,7 @@ sla-instance_guid = ${slap-parameter:frontend-instance-guid}
 <= monitor-promise-base
 promise = check_url_available
 name = frontend_promise.py
-config-url = ${publish-connection-information:url}
+config-url = ${request-slave-frontend:connection-secure_access}
 
 {% if additional_frontend %}
 [request-slave-frontend-additional]