Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/nagios/manifests/server.pp

Issue 5862055731003392: Noissue - Ensure the correct FQDNs are computed for Nagios (Closed)
Patch Set: Created March 17, 2015, 2:49 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 class nagios::server( 1 class nagios::server(
2 $domain, 2 $domain,
3 $certificate, 3 $certificate,
4 $private_key, 4 $private_key,
5 $is_default=false, 5 $is_default=false,
6 $htpasswd_source, 6 $htpasswd_source,
7 $admins, 7 $admins,
8 $zone, 8 $zone,
9 ) { 9 ) {
10 10
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 create_resources(nagios::server::generic_host, $nagios_generic) 169 create_resources(nagios::server::generic_host, $nagios_generic)
170 170
171 define generic_host( 171 define generic_host(
172 $ip, 172 $ip,
173 $ssh_public_key = undef, 173 $ssh_public_key = undef,
174 $role = undef, 174 $role = undef,
175 $dns = undef, 175 $dns = undef,
176 $groups = [], 176 $groups = [],
177 ) { 177 ) {
178 178
179 $fqdn_name = join([$name, $nagios::server::zone], '.') 179 if $dns == undef {
180 $fqdn_name = join([$name, $nagios::server::zone], '.')
181 } else {
182 $fqdn_name = $dns
183 }
180 184
181 nagios_host {$fqdn_name: 185 nagios_host {$fqdn_name:
182 use => 'generic-host', 186 use => 'generic-host',
183 hostgroups => $groups, 187 hostgroups => $groups,
184 } 188 }
185 } 189 }
186 } 190 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld