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

Unified Diff: modules/filtermaster/templates/sitescripts.ini.erb

Issue 29323001: Issue 2836 - Fix regressions from #2814 / #2835 (Closed)
Patch Set: Created July 29, 2015, 6:25 p.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 | « modules/filtermaster/manifests/init.pp ('k') | modules/private-stub/hiera/roles/filtermasterserver.yaml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/filtermaster/templates/sitescripts.ini.erb
diff --git a/modules/filtermaster/templates/sitescripts.ini.erb b/modules/filtermaster/templates/sitescripts.ini.erb
index 787cd7fe88f446cbbe5cff3a79720d390e630774..8d63d4000e1341a9d0ce77d7482d027ec6825c45 100644
--- a/modules/filtermaster/templates/sitescripts.ini.erb
+++ b/modules/filtermaster/templates/sitescripts.ini.erb
@@ -2,6 +2,10 @@
root=/home/rsync/subscription
[subscriptionDownloads]
-<% scope.function_hiera('filtermaster::repo_download', {}).each do |key, hash| -%>
+<% @repos.each do |key| -%>
+<%= key %>_repository=%(root)s/<%= key %>
+<% end -%>
+<% @repo_downloads.each do |key, hash| -%>
<%= hash['alias'] rescue key %>_repository=%(root)s/<%= key %>
<% end -%>
+outdir=/home/rsync/generated
« no previous file with comments | « modules/filtermaster/manifests/init.pp ('k') | modules/private-stub/hiera/roles/filtermasterserver.yaml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld