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

Unified 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.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | manifests/monitoringserver.pp » ('j') | modules/filterserver/manifests/init.pp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: manifests/filterserver.pp
===================================================================
--- a/manifests/filterserver.pp
+++ b/manifests/filterserver.pp
@@ -1,9 +1,17 @@
-node 'server5', 'server6', 'server7', 'server11', 'server12', 'server15', 'server19', 'filter1', 'filter2', 'filter3', 'filter4', 'filter5', 'filter6' {
- include base, filterserver
+node 'server5', 'server6', 'server7', 'server11', 'server12', 'server15', 'server19', 'filter1', 'filter2', 'filter3', 'filter4', 'filter5', 'filter6', 'notification1', 'notification2' {
Felix Dahlke 2014/01/30 13:51:48 How about taking notification1 and 2 out of here a
+ include base
+
+ class {'filterserver':
+ is_default => true
Felix Dahlke 2014/01/30 13:51:48 Not really a fan of this, I'd rather just merge no
+ }
+
+ class {'notificationserver':
+ is_default => false
+ }
class {'nagios::client':
server_address => 'monitoring.adblockplus.org'
}
class {'statsclient': }
}
« no previous file with comments | « no previous file | manifests/monitoringserver.pp » ('j') | modules/filterserver/manifests/init.pp » ('J')

Powered by Google App Engine
This is Rietveld