Minor fixes

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index 382715972a96fcc2ad7cc072e05c2f9d645b483d..dea1fd09dfc0864ddf055bcada7d9da211702c33 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -477,12 +477,12 @@ define vs_sched($ensure = present, $fill_rate = '', $fill_rate2 = '',
         true: {
           $set_idle_time = "--idle-time"
 
-          file { "/etc/vservers/${vserver}/sched/idle-time":
+          file { "/etc/vservers/${name}/sched/idle-time":
             ensure => present,
           }
         }
         default: {
-          file { "/etc/vservers/${vserver}/sched/idle-time":
+          file { "/etc/vservers/${name}/sched/idle-time":
             ensure => absent,
           }
         }
@@ -490,13 +490,13 @@ define vs_sched($ensure = present, $fill_rate = '', $fill_rate2 = '',
 
       $vsched_params = "$set_fill_rate $set_fill_rate2 $set_interval $set_interval2 $set_tokens_min $set_tokens_max $set_tokens $set_idle_time $set_priority_bias"
 
-      exec { "vsched --xid `cat /etc/vservers/$vserver/context` ${vsched_params} --force":
-        subscribe   => File["/etc/vservers/$vserver/sched/fill_rate",  "/etc/vservers/$vserver/sched/fill_rate2",
-                            "/etc/vservers/$vserver/sched/interval",   "/etc/vservers/$vserver/sched/interval2",
-                            "/etc/vservers/$vserver/sched/tokens-min", "/etc/vservers/$vserver/sched/tokens-max",
-                            "/etc/vservers/$vserver/sched/tokens",     "/etc/vservers/$vserver/sched/idle-time"],
+      exec { "vsched --xid `cat /etc/vservers/$name/context` ${vsched_params} --force":
+        subscribe   => File["/etc/vservers/$name/sched/fill_rate",  "/etc/vservers/$name/sched/fill_rate2",
+                            "/etc/vservers/$name/sched/interval",   "/etc/vservers/$name/sched/interval2",
+                            "/etc/vservers/$name/sched/tokens-min", "/etc/vservers/$name/sched/tokens-max",
+                            "/etc/vservers/$name/sched/tokens",     "/etc/vservers/$name/sched/idle-time"],
         refreshonly => true, 
-        require     => Exec["vs_create_${vserver}"],
+        require     => Exec["vs_create_${name}"],
       }
     }
   }