opendev
/
puppet-zuul
Code Issues Proposed changes

Merge "Configure swift credentials for workers to push to"

This commit is contained in:
Jenkins 2014-05-20 20:56:56 +00:00 committed by Gerrit Code Review
parent 62ae84f837 e683c9eb19
commit ae2d002493
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/init.pp
View File

@ -34,6 +34,13 @@ class zuul (
$statsd_host = '',
$git_email = '',
$git_name = '',
$swift_authurl = '',
$swift_user = '',
$swift_key = '',
$swift_tenant_name = '',
$swift_region_name = '',
$swift_default_container = '',
$swift_default_logserver_prefix = '',
) {
include apache
include pip

18
templates/zuul.conf.erb
View File

@ -30,3 +30,21 @@ git_user_email=<%= git_email %>
<% if git_name != "" -%>
git_user_name=<%= git_name %>
<% end -%>
<% if swift_authurl != "" -%>
[swift]
authurl=<%= swift_authurl %>
user=<%= swift_user %>
key=<%= swift_key %>
<% if swift_tenant_name != "" -%>
tenant_name=<%= swift_tenant_name %>
<% else -%>
# tenant_name is not provided here as some swift providers
# do not have identity servers that work when tenant_name
# is provided. You may set the tenant_name if necessary
# but otherwise it is unset to accomodate these providers.
<% end -%>
region_name=<%= swift_region_name %>
default_container=<%= swift_default_container %>
default_logserver_prefix=<%= swift_default_logserver_prefix %>
<% end -%>