| OLD | NEW |
| 1 class base ($zone='adblockplus.org') { | 1 class base ($zone='adblockplus.org') { |
| 2 | 2 |
| 3 $servers = hiera('servers') | 3 $servers = hiera('servers') |
| 4 create_resources(base::explicit_host_record, $servers) | 4 create_resources(base::explicit_host_record, $servers) |
| 5 | 5 |
| 6 define explicit_host_record( | 6 define explicit_host_record( |
| 7 $ip, | 7 $ip, |
| 8 $ssh_public_key = undef, | 8 $ssh_public_key = undef, |
| 9 $role = undef, | 9 $role = undef, |
| 10 $dns = undef, | 10 $dns = undef, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 } | 27 } |
| 28 | 28 |
| 29 adblockplus::host {$title: | 29 adblockplus::host {$title: |
| 30 fqdn => $fqdn, | 30 fqdn => $fqdn, |
| 31 groups => $groups, | 31 groups => $groups, |
| 32 ips => $ips, | 32 ips => $ips, |
| 33 name => $name, | 33 name => $name, |
| 34 role => $role, | 34 role => $role, |
| 35 public_key => $public_key, | 35 public_key => $public_key, |
| 36 } | 36 } |
| 37 | |
| 38 # Implicit realization behavior has been introduced by accident in a | |
| 39 # previous version, hence it should be kept until class base is obsolete | |
| 40 # and the obsolete records have been removed | |
| 41 realize(Host[$title]) | |
| 42 realize(Sshkey[$title]) | |
| 43 } | 37 } |
| 44 } | 38 } |
| OLD | NEW |