Use newer 'service' path.

Requires slapos.core 0.32.2

software/kvm/instance-kvm.cfg

@@ -17,46 +17,46 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[rootdirectory]
+[directory]
 recipe = slapos.cookbook:mkdirectory
 etc = $${buildout:directory}/etc
 bin = $${buildout:directory}/bin
 srv = $${buildout:directory}/srv
 var = $${buildout:directory}/var
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
-promises = $${rootdirectory:etc}/promise
-novnc-conf = $${rootdirectory:etc}/novnc
-run = $${rootdirectory:var}/run
-ca-dir = $${rootdirectory:srv}/ssl
+scripts = $${:etc}/run
+services = $${:etc}/service
+promises = $${:etc}/promise
+novnc-conf = $${:etc}/novnc
+run = $${:var}/run
+ca-dir = $${:srv}/ssl
 
 [create-mac]
 recipe = slapos.cookbook:generate.mac
-storage-path = $${rootdirectory:srv}/mac
+storage-path = $${directory:srv}/mac
 
 [gen-passwd]
 recipe = slapos.cookbook:generate.password
-storage-path = $${rootdirectory:srv}/passwd
+storage-path = $${directory:srv}/passwd
 bytes = 4
 
 [kvm-instance]
+# XXX-Cedric: change "KVM" recipe to simple "create wrappers". No need for this
+# Specific code
 recipe = slapos.cookbook:kvm
 vnc-ip = $${slap-network-information:local-ipv4}
 vnc-port = 5901
 nbd-ip = $${slap-parameter:nbd_ip}
 nbd-port = $${slap-parameter:nbd_port}
 tap = $${slap-network-information:network-interface}
-disk-path = $${rootdirectory:srv}/virtual.qcow2
+disk-path = $${directory:srv}/virtual.qcow2
 disk-size = 10
-socket-path = $${rootdirectory:var}/qmp_socket
-pid-path = $${basedirectory:run}/pid_file
+socket-path = $${directory:var}/qmp_socket
+pid-path = $${directory:run}/pid_file
 smp-count = 1
 ram-size = 1024
 mac-address = $${create-mac:mac-address}
-runner-path = $${basedirectory:services}/kvm
-controller-path = $${basedirectory:services}/kvm_controller
+runner-path = $${directory:services}/kvm
+controller-path = $${directory:scripts}/kvm_controller
 shell-path = ${dash:location}/bin/dash
 qemu-path = ${kvm:location}/bin/qemu-system-x86_64
 qemu-img-path = ${kvm:location}/bin/qemu-img
@@ -64,7 +64,7 @@ passwd = $${gen-passwd:passwd}
 
 [kvm-promise]
 recipe = slapos.cookbook:check_port_listening
-path = $${basedirectory:promises}/vnc_promise
+path = $${directory:promises}/vnc_promise
 hostname = $${kvm-instance:vnc-ip}
 port = $${kvm-instance:vnc-port}
 
@@ -83,15 +83,15 @@ ssl-cert-path = $${ca-novnc:cert-file}
 
 [websockify-sighandler]
 recipe = slapos.cookbook:signalwrapper
-wrapper-path = $${basedirectory:services}/websockify
+wrapper-path = $${directory:services}/websockify
 wrapped-path = $${novnc-instance:path}
 
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
 openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${basedirectory:ca-dir}
+ca-dir = $${directory:ca-dir}
 requests-directory = $${cadirectory:requests}
-wrapper = $${basedirectory:services}/certificate_authority
+wrapper = $${directory:services}/certificate_authority
 ca-private = $${cadirectory:private}
 ca-certs = $${cadirectory:certs}
 ca-newcerts = $${cadirectory:newcerts}
@@ -99,30 +99,30 @@ ca-crl = $${cadirectory:crl}
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
-requests = $${basedirectory:ca-dir}/requests/
-private = $${basedirectory:ca-dir}/private/
-certs = $${basedirectory:ca-dir}/certs/
-newcerts = $${basedirectory:ca-dir}/newcerts/
-crl = $${basedirectory:ca-dir}/crl/
+requests = $${directory:ca-dir}/requests/
+private = $${directory:ca-dir}/private/
+certs = $${directory:ca-dir}/certs/
+newcerts = $${directory:ca-dir}/newcerts/
+crl = $${directory:ca-dir}/crl/
 
 [ca-novnc]
 <= certificate-authority
 recipe = slapos.cookbook:certificate_authority.request
-key-file = $${basedirectory:novnc-conf}/novnc.key
-cert-file = $${basedirectory:novnc-conf}/novnc.crt
-executable = $${rootdirectory:bin}/novnc
-wrapper = $${rootdirectory:bin}/websockify
+key-file = $${directory:novnc-conf}/novnc.key
+cert-file = $${directory:novnc-conf}/novnc.crt
+executable = $${directory:bin}/novnc
+wrapper = $${directory:bin}/websockify
 
 [novnc-promise]
 recipe = slapos.cookbook:check_port_listening
-path = $${basedirectory:promises}/novnc_promise
+path = $${directory:promises}/novnc_promise
 hostname = $${novnc-instance:ip}
 port = $${novnc-instance:port}
 
 
 [kvm-monitor]
 recipe = slapos.cookbook:generic.slapmonitor
-db-path = $${rootdirectory:srv}/slapmonitor_database
+db-path = $${directory:srv}/slapmonitor_database
 
 
 [request-slave-frontend]
@@ -154,7 +154,7 @@ url = $${request-slave-frontend:connection-url}/vnc_auto.html?host=$${request-sl
 
 [frontend-promise]
 recipe = slapos.cookbook:check_url_available
-path = $${basedirectory:promises}/frontend_promise
+path = $${directory:promises}/frontend_promise
 url = $${publish-kvm-frontend-connection-information:url}
 dash_path = ${dash:location}/bin/dash
 curl_path = ${curl:location}/bin/curl

software/kvm/software.cfg

@@ -27,11 +27,11 @@ parts =
 #XXX-Cedric : Currently, one can only access to KVM using noVNC.
 #             Ideally one should be able to access KVM by using either NoVNC or VNC.
 #             Problem is : no native crypto support in web browsers. So we have to disable ssl
-#             In qemu builtin vnc server, and make it available only for localhost 
+#             In qemu builtin vnc server, and make it available only for localhost
 #             so that only novnc can listen to it.
 
 #XXX-Cedric: Check status of https://github.com/kanaka/noVNC/issues/13 to see
-#            When qemu has builtin support for websockets in vnc server to get rid of 
+#            When qemu has builtin support for websockets in vnc server to get rid of
 #            Websockify (socket <-> websocket proxy server) when it is ready.
 #            May solve previous XXX depending on the implementation.
 
@@ -119,7 +119,7 @@ command =
 [template-kvm]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kvm.cfg
-md5sum = 6aaa9b6ef059a2ed2f022834151086ab
+md5sum = 68478e759138a42f09518d01da548b8a
 output = ${buildout:directory}/template-kvm.cfg
 mode = 0644