aboutsummaryrefslogtreecommitdiff
path: root/templates/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'templates/puppet')
-rw-r--r--templates/puppet/nodes.pp.erb2
-rw-r--r--templates/puppet/server.pp.erb6
2 files changed, 1 insertions, 7 deletions
diff --git a/templates/puppet/nodes.pp.erb b/templates/puppet/nodes.pp.erb
index 2cb58b4..15290d8 100644
--- 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 ca0ab50..9aec40a 100644
--- 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
#