Definition vs_cflags needs a $vserver parameter

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index c4da01b58fbdc51351799ea97cf9c21de9eb9943..4d4eaf181bea06764d2a4b22cdcd50499e6a8948 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -501,33 +501,33 @@ define vs_sched($ensure = present, $fill_rate = '', $fill_rate2 = '',
   }
 }
 
-define vs_cflags($flag, $ensure = present) {
-  if ! defined(File["/etc/vservers/${name}/cflags"]) {
-    file { "/etc/vservers/${name}/cflags":
+define vs_cflags($vserver, $flag, $ensure = present) {
+  if ! defined(File["/etc/vservers/${vserver}/cflags"]) {
+    file { "/etc/vservers/${vserver}/cflags":
       ensure  => present,
     }
   }
 
-  line {"vs_cflags-${name}-${flag}":
+  line {"vs_cflags-${vserver}-${flag}":
     ensure  => $ensure,
-    file    => "/etc/vservers/${name}/cflags",
+    file    => "/etc/vservers/${vserver}/cflags",
     line    => "${flag}",
-    require => Exec["vs_create_${name}"],
-    notify  => Exec["vattribute-${name}-${flag}"],
+    require => Exec["vs_create_${vserver}"],
+    notify  => Exec["vattribute-${vserver}-${flag}"],
   }
 
   case $ensure {
     present: {
-      exec { "vattribute-${name}-${flag}":
-        command     => "vattribute --set --xid `cat /etc/vservers/$name/context` --flag ${flag}",
+      exec { "vattribute-${vserver}-${flag}":
+        command     => "vattribute --set --xid `cat /etc/vservers/$vserver/context` --flag ${flag}",
         refreshonly => true, 
-        require     => exec["vs_create_${name}"],
+        require     => exec["vs_create_${vserver}"],
       }
     default: {
-      exec { "vattribute-${name}-${flag}":
-        command     => "vattribute --set --xid `cat /etc/vservers/$name/context` --flag ~${flag}",
+      exec { "vattribute-${vserver}-${flag}":
+        command     => "vattribute --set --xid `cat /etc/vservers/$vserver/context` --flag ~${flag}",
         refreshonly => true, 
-        require     => exec["vs_create_${name}"],
+        require     => exec["vs_create_${vserver}"],
       }
     }
   }