fixing main server templates

diff --git a/manifests/classes/default_conf.pp b/manifests/classes/default_conf.pp
index 885171bbab3de0154fd4451288ea0309096a05d7..31bdc3dd3e17d59a3422e5480468098cac92d738 100644 (file)
--- a/manifests/classes/default_conf.pp
+++ b/manifests/classes/default_conf.pp
@@ -102,7 +102,7 @@ class default_conf {
   }
 
   # files in $default_puppet_conf_dir/manifests/nodes
-  file { "$default_puppet_conf_dir/manifests/nodes/$hostname-server.pp":
+  file { "$default_puppet_conf_dir/manifests/nodes/$hostname.pp":
     ensure  => present,
     owner   => "puppet",
     group   => "puppet",

diff --git a/templates/puppet/nodes.pp.erb b/templates/puppet/nodes.pp.erb
index 2cb58b45eb9df8240387fe845e6de4439811d32e..15290d8b0dc41243ba9c8bcda8c3d0cef05fd5e6 100644 (file)
--- a/templates/puppet/nodes.pp.erb
+++ b/templates/puppet/nodes.pp.erb
@@ -1,4 +1,4 @@
-import "nodes/<%= hostname %>-server.pp"
+import "nodes/<%= hostname %>.pp"
 import "nodes/<%= hostname %>-master.pp"
 import "nodes/<%= hostname %>-proxy.pp"
 import "nodes/<%= hostname %>-web.pp"

diff --git a/templates/puppet/server.pp.erb b/templates/puppet/server.pp.erb
index ca0ab50d082ef6ca5bfc53f5a06d8caad2f80ef7..9aec40a33344aa6e0ef7f478824439f5bd768b0c 100644 (file)
--- a/templates/puppet/server.pp.erb
+++ b/templates/puppet/server.pp.erb
@@ -7,12 +7,6 @@ node '<%= hostname %>.<%= domain %>' {
   $has_ups                = false
   include nodo::server
 
-  host { "puppet":
-    ensure        => present,
-    ip            => "127.0.0.1",
-    host_aliases  => [ "puppet.<%= domain %>" ],
-  }
-
   #
   # Linux-VServers
   #