Cleanup virtual::vserver::instance

diff --git a/manifests/vserver/cflags.pp b/manifests/vserver/cflags.pp
index c6df50f9e727908087c2ab801e6993cb7cd6efc8..43e7d2addb946851046c20f78f21bf403c50ae6d 100644 (file)
--- a/manifests/vserver/cflags.pp
+++ b/manifests/vserver/cflags.pp
@@ -32,4 +32,3 @@ define virtual::vserver::cflags($vserver, $flag, $ensure = present) {
     }
   }
 }
-

diff --git a/manifests/vserver/instance.pp b/manifests/vserver/instance.pp
index 3ec913012e07825e840785daecf626b929943389..5e6e6ae01d8b77c75b7466d0bdc5650578a897c4 100644 (file)
--- a/manifests/vserver/instance.pp
+++ b/manifests/vserver/instance.pp
@@ -24,7 +24,7 @@ define virtual::vserver::instance(
     false: {
       exec { "/usr/local/bin/build_vserver \"${vs_name}\" ${context} ${distro} ${debootstrap_mirror} ${vs_hostname} ${vs_interface} ${memory_limit}":
         creates => "/etc/vservers/${vs_name}",
-        require => File["/usr/local/bin/build_vserver","/etc/vservers/.defaults/vdirbase"],
+        require => File["/usr/local/bin/build_vserver", "/etc/vservers/.defaults/vdirbase"],
         alias   => "vserver_instance_${vs_name}",
         # TODO: change when this is fixed: http://projects.puppetlabs.com/issues/4769
         timeout => $lsbdistcodename ? {
@@ -42,48 +42,47 @@ define virtual::vserver::instance(
     require => Exec["vserver_instance_${vs_name}"],
   }
 
-  case $memory_limit {
-    false: {
-      file { "/etc/vservers/${vs_name}/rlimits/rss.hard":
-        mode   => 0644, owner => root, group => root,
-        ensure => absent,
-      }
-
-      file { "/etc/vservers/${vs_name}/rlimits/rss.soft":
-        mode   => 0644, owner => root, group => root,
-        ensure => absent,
-      }
-
-      virtual::vserver::cflags { "${vs_name}-virt_mem":
-        vserver => $vs_name,
-        flag    => "virt_mem",
-        ensure  => absent,
-      }
-    }
-    default: {
-      file { "/etc/vservers/${vs_name}/rlimits/rss.hard":
-        mode    => 0644,
-        owner   => root,
-        group   => root,
-        content => template("virtual/rss.hard.erb"),
-        require => File["/etc/vservers/${vs_name}/rlimits"],
-      }
+  file { "/etc/vservers/${vs_name}/rlimits/rss.hard":
+    mode    => 0644,
+    owner   => root,
+    group   => root,
+    content => template("virtual/rss.hard.erb"),
+    require => $memory_limit ? {
+      false   => undef,
+      default => File["/etc/vservers/${vs_name}/rlimits"],
+    },
+    ensure  => $memory_limit ? {
+      false   => absent,
+      default => present,
+    },
+  }
 
-      file { "/etc/vservers/${vs_name}/rlimits/rss.soft":
-        mode    => 0644,
-        owner   => root,
-        group   => root,
-        content => template("virtual/rss.soft.erb"),
-        require => File["/etc/vservers/${vs_name}/rlimits"],
-      }
+  file { "/etc/vservers/${vs_name}/rlimits/rss.soft":
+    mode    => 0644,
+    owner   => root,
+    group   => root,
+    content => template("virtual/rss.soft.erb"),
+    require => $memory_limit ? {
+      false   => undef,
+      default => File["/etc/vservers/${vs_name}/rlimits"],
+    },
+    ensure  => $memory_limit ? {
+      false   => absent,
+      default => present,
+    },
+  }
 
-      vs_cflags { "${vs_name}-virt_mem":
-        vserver => $vs_name,
-        flag    => "virt_mem",
-        ensure  => present,
-        require => Exec["vserver_instance_${vs_name}"],
-      }
-    }
+  virtual::vserver::cflags { "${vs_name}-virt_mem":
+    vserver => $vs_name,
+    flag    => "virt_mem",
+    ensure  => present,
+    require => $memory_limit ? {
+      false   => undef,
+      default => Exec["vserver_instance_${vs_name}"],
+    },
+    ensure  => $memory_limit ? {
+      false   => absent,
+      default => present,
+    },
   }
 }
-

diff --git a/manifests/vserver/rlimit.pp b/manifests/vserver/rlimit.pp
index 0218359e4d7d069c095c8360885ef9c685421e0d..0369750a1771a83bf276f1f21179136549627ee5 100644 (file)
--- a/manifests/vserver/rlimit.pp
+++ b/manifests/vserver/rlimit.pp
@@ -45,4 +45,3 @@ define virtual::vserver::rlimit(
     notify  => Exec["vs_restart_${vserver}"],
   }
 }
-