diff --git a/modules/openstack_project/manifests/zuul_prod.pp b/modules/openstack_project/manifests/zuul_prod.pp index 76e01734a3..5400620900 100644 --- a/modules/openstack_project/manifests/zuul_prod.pp +++ b/modules/openstack_project/manifests/zuul_prod.pp @@ -10,6 +10,7 @@ class openstack_project::zuul_prod( $url_pattern = '', $zuul_url = '', $swift_authurl = '', + $swift_auth_version = '', $swift_user = '', $swift_key = '', $swift_tenant_name = '', @@ -44,6 +45,7 @@ class openstack_project::zuul_prod( git_email => 'jenkins@openstack.org', git_name => 'OpenStack Jenkins', swift_authurl => $swift_authurl, + swift_auth_version => $swift_auth_version, swift_user => $swift_user, swift_key => $swift_key, swift_tenant_name => $swift_tenant_name, diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp index 3ac21874e7..3ce02a2a75 100644 --- a/modules/zuul/manifests/init.pp +++ b/modules/zuul/manifests/init.pp @@ -40,6 +40,7 @@ class zuul ( $smtp_default_from = "zuul@${::fqdn}", $smtp_default_to = "zuul.reports@${::fqdn}", $swift_authurl = '', + $swift_auth_version = '', $swift_user = '', $swift_key = '', $swift_tenant_name = '', diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb index 18cb54f25c..b158443200 100644 --- a/modules/zuul/templates/zuul.conf.erb +++ b/modules/zuul/templates/zuul.conf.erb @@ -43,6 +43,9 @@ tenant_name=<%= swift_tenant_name %> region_name=<%= swift_region_name %> default_container=<%= swift_default_container %> default_logserver_prefix=<%= swift_default_logserver_prefix %> +<% if swift_auth_version != "" -%> +auth_version=<%= swift_auth_version %> +<% end -%> <% end -%> <% if smtp_host != "" -%>