Setting nodename according to hostname value

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index ef4f01c74e4cf3ff4d7c4a0327f67ec36650cb5e..5611c278452768ba1d1ebd876380107478c696b0 100644 (file)
--- a/manifests/vserver.pp
+++ b/manifests/vserver.pp
@@ -150,6 +150,7 @@ define vserver($ensure, $context, $in_domain = '', $mark = '', $legacy = false,
 
   case $vs_name { '': { fail ( "Cannot create VServer with empty name" ) } }
 
+  $nodename  = $hostname ? { false => $vs_name, default => $hostname }
   $if_dir    = "/etc/vservers/${vs_name}/interfaces"
   $mark_file = "/etc/vservers/${vs_name}/apps/init/mark"
 
@@ -216,7 +217,7 @@ define vserver($ensure, $context, $in_domain = '', $mark = '', $legacy = false,
     "/var/lib/puppet/modules/virtual/contexts/${context}":
       content => "\n";
     "/etc/vservers/${vs_name}/uts/nodename":
-      content => "${vs_name}\n",
+      content => "${nodename}\n",
       notify => Exec["vs_restart_${vs_name}"],
       require => Exec["vs_create_${vs_name}"];
     "/etc/vservers/${vs_name}/name":