aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-06-14 01:41:43 -0300
committerSilvio Rhatto <rhatto@riseup.net>2018-06-14 01:41:43 -0300
commit2b1ad5dbb7d8db09709a9e50e43a295a5428bd43 (patch)
treeed426257fd5638f5afc4c52cfec36666cfd556ca /manifests
parentbb47461517cece97d87567e26449a84de2fd3540 (diff)
downloadpuppet-nodo-2b1ad5dbb7d8db09709a9e50e43a295a5428bd43.tar.gz
puppet-nodo-2b1ad5dbb7d8db09709a9e50e43a295a5428bd43.tar.bz2
KVMX enhancements
Diffstat (limited to 'manifests')
-rw-r--r--manifests/subsystem/virtual/instance.pp22
1 files changed, 15 insertions, 7 deletions
diff --git a/manifests/subsystem/virtual/instance.pp b/manifests/subsystem/virtual/instance.pp
index 048f394..7f08384 100644
--- 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}"],
}
}