Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/300838
Change subject: role::jobqueue_redis: sort redis instances
......................................................................
role::jobqueue_redis: sort redis instances
This is needed in order not to cause compilation differences between
different versions of puppet/ruby
Bug: T141242
Change-Id: I04013b26a5a5c1f7b49cd995d1e78456876e4a48
---
M modules/redis/lib/puppet/parser/functions/redis_get_instances.rb
M modules/redis/lib/puppet/parser/functions/redis_shard_hosts.rb
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/300838/1
diff --git a/modules/redis/lib/puppet/parser/functions/redis_get_instances.rb
b/modules/redis/lib/puppet/parser/functions/redis_get_instances.rb
index e497f25..cb0aca8 100644
--- a/modules/redis/lib/puppet/parser/functions/redis_get_instances.rb
+++ b/modules/redis/lib/puppet/parser/functions/redis_get_instances.rb
@@ -14,6 +14,6 @@
instances << data['port'].to_s
end
end
- instances
+ instances.sort
end
end
diff --git a/modules/redis/lib/puppet/parser/functions/redis_shard_hosts.rb
b/modules/redis/lib/puppet/parser/functions/redis_shard_hosts.rb
index cbdab1d..454c5c4 100644
--- a/modules/redis/lib/puppet/parser/functions/redis_shard_hosts.rb
+++ b/modules/redis/lib/puppet/parser/functions/redis_shard_hosts.rb
@@ -42,6 +42,6 @@
my_ips |= servers[s]
end
# Resolve the ip back to a hostname, used for ipsec
- my_ips.map { |h| function_ipresolve([h, 'ptr']) }
+ my_ips.map { |h| function_ipresolve([h, 'ptr']) }.sort
end
end
--
To view, visit https://gerrit.wikimedia.org/r/300838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04013b26a5a5c1f7b49cd995d1e78456876e4a48
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
