Unified Diff: modules/base/manifests/init.pp
Issue 4810150141493248:
Issue 122 - Puppet ENC via Hiera (Closed)
Patch Set: Puppet ENC via Hiera
Created March 4, 2015, 5:59 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« hiera/puppet-node-classifier.rb ('K')
|
« manifests/webserver.pp ('k')
|
modules/filtermaster/manifests/init.pp » ('j')
|
modules/nagios/manifests/server.pp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/base/manifests/init.pp |
| =================================================================== |
| --- a/modules/base/manifests/init.pp |
| +++ b/modules/base/manifests/init.pp |
| @@ -1,4 +1,4 @@ |
| -class base { |
| +class base ($zone='adblockplus.org') { |
| stage {'pre': before => Stage['main']} |
| stage {'post': require => Stage['main']} |
| @@ -39,4 +39,51 @@ |
| class {'logrotate': |
| stage => 'post' |
| } |
| + |
| + $servers = hiera("servers") |
|
Felix Dahlke
2015/03/09 23:14:51
Nit from the Puppet style guide:
"All strings mus
mathias
2015/03/16 12:07:11
Done.
|
| + create_resources(base::explicit_host_record, $servers) |
| + |
| + define explicit_host_record( |
| + $ip, |
| + $ssh_public_key = undef, |
| + $role = undef, |
| + $dns = undef, |
| + $groups = undef, |
| + ) { |
| + |
| + if is_array($ip) { |
| + $internal_ip = $ip[0] |
| + } else { |
| + $internal_ip = $ip |
| + } |
| + |
| + $fqdn_name = join([$name, $base::zone], ".") |
|
Felix Dahlke
2015/03/09 23:14:51
Nit: Should be single quotes here too.
mathias
2015/03/16 12:07:11
Done.
|
| + |
| + host{$name: |
| + ensure => present, |
| + ip => $internal_ip, |
| + name => $fqdn_name, |
| + host_aliases => $dns ? { |
| + undef => [], |
| + default => $dns, |
| + } |
| + } |
| + |
| + if $ssh_public_key != undef { |
| + |
| + $name_key = $dns ? { |
| + undef => $fqdn_name, |
| + default => $dns, |
| + } |
| + |
| + @sshkey {$name: |
| + name => $name_key, |
| + key => $ssh_public_key, |
| + type => ssh-rsa, |
| + host_aliases => $ip, |
| + } |
| + } |
| + |
| + } |
| } |
| + |
