Merge "Configure swift credentials for workers to push to"
This commit is contained in:
commit
ae2d002493
|
@ -34,6 +34,13 @@ class zuul (
|
||||||
$statsd_host = '',
|
$statsd_host = '',
|
||||||
$git_email = '',
|
$git_email = '',
|
||||||
$git_name = '',
|
$git_name = '',
|
||||||
|
$swift_authurl = '',
|
||||||
|
$swift_user = '',
|
||||||
|
$swift_key = '',
|
||||||
|
$swift_tenant_name = '',
|
||||||
|
$swift_region_name = '',
|
||||||
|
$swift_default_container = '',
|
||||||
|
$swift_default_logserver_prefix = '',
|
||||||
) {
|
) {
|
||||||
include apache
|
include apache
|
||||||
include pip
|
include pip
|
||||||
|
|
|
@ -30,3 +30,21 @@ git_user_email=<%= git_email %>
|
||||||
<% if git_name != "" -%>
|
<% if git_name != "" -%>
|
||||||
git_user_name=<%= git_name %>
|
git_user_name=<%= git_name %>
|
||||||
<% end -%>
|
<% 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 -%>
|
||||||
|
|
Loading…
Reference in New Issue