Configure swift credentials for workers to push to

This change adds credentials as set up by fungi (2014-04-05T03:16:46)
http://eavesdrop.openstack.org/irclogs/%23openstack-infra/%23openstack-infra.2014-04-05.log

This allows zuul to send signed URL's for workers to push files to on
a per-job basis.

This change will require a zuul restart, not just a reload!

Note this is unreverts the revert in
c1b98eaff618b8c739cc02f089ef6fe6c02cbcc3 but is slightly edited hence
the lack of a proper revert commit. The reason for the revert has been
debugged and was due to rax identity service not providing a catalog
entry for swift when a tenant name is provided.

Change-Id: I04d3207002f7422b9851515ee88a74b19dd2f248
This commit is contained in:
Joshua Hesketh 2014-04-05 15:58:12 +11:00 committed by Clark Boylan
parent aa67e97317
commit e683c9eb19
2 changed files with 25 additions and 0 deletions

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

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 -%>