aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/subsystem/virtual/instance.pp19
-rw-r--r--manifests/utils/virtual.pp1
2 files changed, 15 insertions, 5 deletions
diff --git a/manifests/subsystem/virtual/instance.pp b/manifests/subsystem/virtual/instance.pp
index 4f54804..0f1b2c1 100644
--- 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 e79d9c1..a6cf438 100644
--- 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,
}