Yuvipanda has submitted this change and it was merged.

Change subject: shinkengen: Ensure consistent ordering of hostgroups
......................................................................


shinkengen: Ensure consistent ordering of hostgroups

Otherwise --test-if-up-to-date is rarely (if ever) going to work properly

Change-Id: Ic5515e36c1c6616a7eb90df5300886ffa0c557d3
---
M modules/shinken/files/shinkengen
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index 2ff598f..310aae1 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -136,7 +136,7 @@
             # manifests/site.pp, so we need to add it here explicitly.
             hostgroups = [project, 'role::labs::instance'] + 
instance['puppetClasses']
             hostgroups += get_instance_roles(instance['project'], 
instance['fqdn'])
-            co.properties['hostgroups'] = ','.join(set(hostgroups))
+            co.properties['hostgroups'] = ','.join(sorted(set(hostgroups)))
             # For each project added to monitoring we expect a contactgroup 
with the same
             # name added.
             # FIXME: Implement access mechanism more fine grained than 
per-project

-- 
To view, visit https://gerrit.wikimedia.org/r/317294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5515e36c1c6616a7eb90df5300886ffa0c557d3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to