aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-12-31 16:59:39 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-12-31 16:59:39 -0200
commit7d580253e52dedc14a76ddda5b9fc6b4259308e6 (patch)
tree4c6e808b459b41782a01593577c9166db5f97eae
parent4b18be69d3635efd618deb8311c4a4fb2dd0c03e (diff)
downloadpuppet-virtual-7d580253e52dedc14a76ddda5b9fc6b4259308e6.tar.gz
puppet-virtual-7d580253e52dedc14a76ddda5b9fc6b4259308e6.tar.bz2
KVMX: supervise and shell support
-rw-r--r--manifests/kvm/instance.pp4
-rw-r--r--manifests/kvm/kvmx.pp16
2 files changed, 18 insertions, 2 deletions
diff --git a/manifests/kvm/instance.pp b/manifests/kvm/instance.pp
index 57e3bf0..81b2a4a 100644
--- a/manifests/kvm/instance.pp
+++ b/manifests/kvm/instance.pp
@@ -1,10 +1,12 @@
define virtual::kvm::instance(
- $udev = false,
+ $udev = false,
+ $shell = undef,
) {
user { $name:
ensure => present,
home => "/home/${name}",
groups => [ 'kvm' ],
+ shell => $shell,
}
if $udev == true {
diff --git a/manifests/kvm/kvmx.pp b/manifests/kvm/kvmx.pp
index daed3d6..23e0ee5 100644
--- a/manifests/kvm/kvmx.pp
+++ b/manifests/kvm/kvmx.pp
@@ -6,7 +6,7 @@ class virtual::kvm::kvmx {
ensure => present,
provider => git,
source => 'https://git.fluxo.info/kvmx',
- revision => 'd2263b94f93e0c0b7549c5a84c18834f8e6e8f58',
+ revision => 'ba560f275675cdb42499c5b03f2593cde508da9b',
owner => 'root',
group => 'root',
}
@@ -25,6 +25,13 @@ class virtual::kvm::kvmx {
require => Vcsrepo['/usr/local/share/kvmx'],
}
+ file { '/usr/local/bin/kvmx-supervise':
+ ensure => '/usr/local/share/kvmx/kvmx-supervise',
+ owner => 'root',
+ group => 'root',
+ require => Vcsrepo['/usr/local/share/kvmx'],
+ }
+
file { '/usr/local/bin/kvmx-status':
ensure => '/usr/local/share/kvmx/kvmx-status',
owner => 'root',
@@ -32,6 +39,13 @@ class virtual::kvm::kvmx {
require => Vcsrepo['/usr/local/share/kvmx'],
}
+ file { '/usr/local/bin/kvmx-shell':
+ ensure => '/usr/local/share/kvmx/kvmx-shell',
+ owner => 'root',
+ group => 'root',
+ require => Vcsrepo['/usr/local/share/kvmx'],
+ }
+
file { '/usr/local/bin/kvmx-vdagent':
ensure => '/usr/local/share/kvmx/kvmx-vdagent',
owner => 'root',