Adding nodo::host class

1 files changed, 1 insertions, 61 deletions

diff --git a/manifests/kvm.pp b/manifests/kvm.pp
index 01bfaec..2f4d632 100644
--- a/manifests/kvm.pp
+++ b/manifests/kvm.pp
@@ -1,64 +1,4 @@
-class nodo::kvm inherits nodo {
-  include syslog-ng
-  include initramfs
-  include modprobe
-  include firewire
-  include sysctl
-  include ups
-  include utils::physical
-  include resolver
-  include monkeysphere_nodo
-
-  # Firewall configuration
-  include firewall
-
-  # Vserver configuration
-  $vserver_vdirbase = "/var/vservers"
-  include vserver::host
-
-  if $use_nagios != false {
-    if $use_nagios_fqdn == true {
-      include nagios::target::fqdn
-    }
-    else {
-      include nagios::target
-    }
-    nagios::service::ping { "$fqdn": }
-  }
-
-  # Time configuration
-  case $ntpdate {
-    false:   { include timezone }
-    default: { include ntpdate  }
-  }
-
-  # SSH Server
-  #
-  # We need to restrict listen address so multiple instances
-  # can live together in the same physical host.
-  #
-  case $sshd_listen_address {
-    '': { $sshd_listen_address = [ "$ipaddress" ] }
-  }
-
-  class { 'sshd':
-    listen_address          => $sshd_listen_address,
-    password_authentication => $sshd_password_authentication,
-    shared_ip               => $sshd_shared_ip,
-    tcp_forwarding          => $sshd_tcp_forwarding,
-    hardened_ssl            => $sshd_hardened_ssl,
-    print_motd              => $sshd_print_motd,
-  }
-
-  backupninja::sys { "sys":
-    ensure => present,
-  }
-
-  # Munin configuration
-  munin_node { "$hostname":
-    port => '4900',
-  }
-
+class nodo::kvm inherits nodo::host {
   # fstab
   file { "/etc/fstab":
     source  => "puppet://$server/modules/nodo/etc/fstab/kvm",