KVMX support

diff --git a/manifests/subsystem/virtual/instance.pp b/manifests/subsystem/virtual/instance.pp
index 4f54804be8babcedaf326467bfb413a08e708e21..0f1b2c1cbfac2acb9b2f8fa37be32d0f196a47bc 100644 (file)
--- a/manifests/subsystem/virtual/instance.pp
+++ b/manifests/subsystem/virtual/instance.pp
@@ -5,6 +5,7 @@ define nodo::subsystem::virtual::instance(
   $ram                   = '1024',
   $size                  = '10G',
   $ensure                = 'running',
+  $implementation        = 'kvmx',
   $proxy                 = false,
   $web                   = false,
   $gitd                  = false,
@@ -32,11 +33,19 @@ define nodo::subsystem::virtual::instance(
     $id = $context
   }
 
-  virtual::kvm::manager::instance { $name:
-    vg   => $vg,
-    size => $size,
-    ram  => $ram,
-    udev => $udev,
+  if $implementation == 'kvmx' {
+    virtual::kvm::instance { $name:
+      udev => $udev,
+    }
+  }
+
+  if $implementation == 'kvm-manager' {
+    virtual::kvm::manager::instance { $name:
+      vg   => $vg,
+      size => $size,
+      ram  => $ram,
+      udev => $udev,
+    }
   }
 
   if $sshkey != '' {

diff --git a/manifests/utils/virtual.pp b/manifests/utils/virtual.pp
index e79d9c193511fe1c2db82239683f9c5fff812ce8..a6cf43846c3c9ce066edd38ecd2d6c9fbb706477 100644 (file)
--- a/manifests/utils/virtual.pp
+++ b/manifests/utils/virtual.pp
@@ -13,6 +13,7 @@ class nodo::utils::virtual (
     'xvfb',
     'virt-viewer',
     'spice-client-gtk',
+    'socat',
   ]:
     ensure => $ensure,
   }