Side by Side Diff: manifests/filterserver.pp
Issue 5302563972841472:
Merge filter and notification servers, have both tasks run on the same servers (Closed)
Patch Set:
Created Jan. 30, 2014, 11:49 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
manifests/monitoringserver.pp » ('j')
|
modules/filterserver/manifests/init.pp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 node 'server5', 'server6', 'server7', 'server11', 'server12', 'server15', 'serve r19', 'filter1', 'filter2', 'filter3', 'filter4', 'filter5', 'filter6' { | 1 node 'server5', 'server6', 'server7', 'server11', 'server12', 'server15', 'serve r19', 'filter1', 'filter2', 'filter3', 'filter4', 'filter5', 'filter6', 'notific ation1', 'notification2' { |
|
Felix Dahlke
2014/01/30 13:51:48
How about taking notification1 and 2 out of here a
| |
| 2 include base, filterserver | 2 include base |
| 3 | 3 |
| 4 class {'filterserver': | |
| 5 is_default => true | |
|
Felix Dahlke
2014/01/30 13:51:48
Not really a fan of this, I'd rather just merge no
| |
| 6 } | |
| 7 | |
| 8 class {'notificationserver': | |
| 9 is_default => false | |
| 10 } | |
| 11 | |
| 4 class {'nagios::client': | 12 class {'nagios::client': |
| 5 server_address => 'monitoring.adblockplus.org' | 13 server_address => 'monitoring.adblockplus.org' |
| 6 } | 14 } |
| 7 | 15 |
| 8 class {'statsclient': } | 16 class {'statsclient': } |
| 9 } | 17 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
manifests/monitoringserver.pp » ('j')
|
modules/filterserver/manifests/init.pp » ('J')
