KVMX enhancements

diff --git a/manifests/subsystem/virtual/instance.pp b/manifests/subsystem/virtual/instance.pp
index 048f394c85cecab03946682d27fa36223bc2816b..7f0838467b1089f637f52e9d3268e4a5bd1d4b85 100644 (file)
--- a/manifests/subsystem/virtual/instance.pp
+++ b/manifests/subsystem/virtual/instance.pp
@@ -28,6 +28,8 @@ define nodo::subsystem::virtual::instance(
   $sshkey                = '',
   $sshkey_type           = 'ssh-rsa',
   $sshkey_options        = [],
+  $initial_user          = 'user',
+  $guest_domain          = $::domain,
 ) {
   # Instance id
   if $context <= 9 {
@@ -38,13 +40,19 @@ define nodo::subsystem::virtual::instance(
 
   if $implementation == 'kvmx' {
     virtual::kvm::kvmx::instance { $name:
-      vg        => $vg,
-      size      => $size,
-      ram       => $ram,
-      udev      => $udev,
-      iface     => $iface,
-      shell     => $shell,
-      supervise => $supervise,
+      vg                => $vg,
+      size              => $size,
+      ram               => $ram,
+      udev              => $udev,
+      iface             => $iface,
+      shell             => $shell,
+      supervise         => $supervise,
+      initial_user      => $initial_user,
+      ip                => "${subnet}.${context}",
+      gateway           => "${subnet}.1",
+      guest_domain      => $guest_domain,
+      ssh_custom_pubkey => "/home/${name}/.ssh/authorized_keys",
+      #require          => Ssh_authorized_key["virtual-instance-${name}"],
     }
   }