From 23e796c344ba87f0ac6bee436a9b3d3ad4bfb269 Mon Sep 17 00:00:00 2001 From: Darren Birkett Date: Tue, 28 Jul 2015 15:55:20 +0100 Subject: [PATCH] set correct swift dispersion tenant In kilo, the swift dispersion user is created as a member of the 'service' tenant. However, we are populating the swift-dispersion.conf as though it was a member of the admin tenant (as it was in juno). This commit fixes that, and makes swift-dispersion-report (and any monitoring plugins that rely on it) work again Change-Id: I0e9b9ccaa487ee0242346ee279821aa09dd5b022 Closes-Bug: #1479006 --- playbooks/roles/os_swift/templates/swift-dispersion.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/os_swift/templates/swift-dispersion.conf.j2 b/playbooks/roles/os_swift/templates/swift-dispersion.conf.j2 index 0dbbf598ed..86ac4954c9 100644 --- a/playbooks/roles/os_swift/templates/swift-dispersion.conf.j2 +++ b/playbooks/roles/os_swift/templates/swift-dispersion.conf.j2 @@ -2,7 +2,7 @@ [dispersion] auth_url = {{ keystone_service_internalurl }} -auth_user = {{ keystone_admin_tenant_name }}:{{ swift_dispersion_user }} +auth_user = {{ swift_service_project_name }}:{{ swift_dispersion_user }} auth_key = {{ swift_dispersion_password }} auth_version = 2.0 endpoint_type = internalURL