Adding auth_version option to zuul.conf

Zuul swift plugin checks for auth_version in zuul.conf. If swift
not found this option, it assumes 2.0 as default.
This patch add the possibility to specify which version you want
to use, allowing custom versions. It will be good in future when
version 3.0 releases.

Change-Id: I1ffd327feba8d290bf05291b022fff00af454c48

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,

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 = '',

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 != "" -%>