diff --git a/manifests/site.pp b/manifests/site.pp
index 97f2c240b4..c73e45214e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -433,9 +433,7 @@ node 'zuul.openstack.org' {
     swift_authurl                  => 'https://identity.api.rackspacecloud.com/v2.0/',
     swift_user                     => 'infra-files-rw',
     swift_key                      => hiera('infra_files_rw_password'),
-    # Yes, really unset the tenant name. Rax identity can't construct a
-    # proper catalog when we provide the tenant here.
-    swift_tenant_name              => '',
+    swift_tenant_name              => hiera('infra_files_tenant_name'),
     swift_region_name              => 'DFW',
     swift_default_container        => 'infra-files',
     swift_default_logserver_prefix => 'http://logs.openstack.org/',
diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb
index 15c8f4074c..f2f840ddc1 100644
--- a/modules/zuul/templates/zuul.conf.erb
+++ b/modules/zuul/templates/zuul.conf.erb
@@ -36,14 +36,7 @@ git_user_name=<%= git_name %>
 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 %>