diff options
| -rw-r--r-- | manifests/classes/default_conf.pp | 2 | ||||
| -rw-r--r-- | templates/puppet/nodes.pp.erb | 2 | ||||
| -rw-r--r-- | templates/puppet/server.pp.erb | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/manifests/classes/default_conf.pp b/manifests/classes/default_conf.pp index 885171b..31bdc3d 100644 --- 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 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 # |