diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 22:35:45 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 22:35:45 -0200 |
| commit | 6c6dcf516c8b4ad3fe0c0a7c34164c98005d9ad8 (patch) | |
| tree | dc5029a05bf254c80d47e0c785e8bc3373462776 /manifests | |
| parent | abbdf8399b74e281402b4b58f1fb10b6db768608 (diff) | |
| download | puppet-nodo-6c6dcf516c8b4ad3fe0c0a7c34164c98005d9ad8.tar.gz puppet-nodo-6c6dcf516c8b4ad3fe0c0a7c34164c98005d9ad8.tar.bz2 | |
KVMX support
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/subsystem/virtual/instance.pp | 19 | ||||
| -rw-r--r-- | manifests/utils/virtual.pp | 1 |
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, } |