Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401512 )
Change subject: cloud puppetmasters: fix an erb issue where we need an array
vs. a string
......................................................................
cloud puppetmasters: fix an erb issue where we need an array vs. a string
Bug: T169086
Change-Id: I654e230682f7fd5809b05ea8d7002e61b7d4a4cb
---
M modules/profile/manifests/openstack/base/puppetmaster/common.pp
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/401512/1
diff --git a/modules/profile/manifests/openstack/base/puppetmaster/common.pp
b/modules/profile/manifests/openstack/base/puppetmaster/common.pp
index f3d1f9b..f252305 100644
--- a/modules/profile/manifests/openstack/base/puppetmaster/common.pp
+++ b/modules/profile/manifests/openstack/base/puppetmaster/common.pp
@@ -15,6 +15,7 @@
) {
# array of puppetmasters
+ $puppetmasters_list = inline_template('<%=
@puppetmasters.values.flatten(1).map { |p| p[\'worker\'] }.sort%>')
$all_puppetmasters = inline_template('<%=
@puppetmasters.values.flatten(1).map { |p| p[\'worker\'] }.sort.join(\' \')%>')
$baremetal_servers_str = inline_template('<%= @baremetal_servers.join " "
%>')
@@ -33,7 +34,7 @@
statsd_host => $statsd_host,
statsd_prefix => $encapi_statsd_prefix,
labs_instance_range => $labs_instance_range,
- all_puppetmasters => $all_puppetmasters,
+ all_puppetmasters => $puppetmasters_list,
}
# Update git checkout. This is done via a cron
--
To view, visit https://gerrit.wikimedia.org/r/401512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I654e230682f7fd5809b05ea8d7002e61b7d4a4cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
