Stabilize KVM password generation.

Password is stored in plaintext on the file system.

slapos/recipe/kvm/__init__.py

@@ -25,7 +25,6 @@
 #
 ##############################################################################
 from slapos.recipe.librecipe import GenericBaseRecipe
-import binascii
 import os
 import sys
 
@@ -33,11 +32,6 @@ class Recipe(GenericBaseRecipe):
   """
   kvm instance configuration.
   """
-
-  def __init__(self, buildout, name, options):
-    options['passwd'] = binascii.hexlify(os.urandom(4))
-    return GenericBaseRecipe.__init__(self, buildout, name, options)
-
   def install(self):
     config = dict(
       tap_interface=self.options['tap'],

software/kvm/instance-kvm.cfg

@@ -35,6 +35,11 @@ ca-dir = $${rootdirectory:srv}/ssl
 recipe = slapos.cookbook:generate.mac
 storage-path = $${rootdirectory:srv}/mac
 
+[gen-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${rootdirectory:srv}/passwd
+bytes = 4
+
 [kvm-instance]
 recipe = slapos.cookbook:kvm
 vnc-ip = $${slap-network-information:local-ipv4}
@@ -54,6 +59,7 @@ controller-path = $${basedirectory:services}/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
+passwd = $${gen-passwd:passwd}
 
 [kvm-promise]
 recipe = slapos.cookbook:check_port_listening