swift-dispersion-report broken in kilo

[Darren Birkett]

In kilo, the swift dispersion user is set up as part of the swift_service_project_name tenant (by default, 'service'). However, the dispersion.conf file is populated using the keystone_admin_tenant_name (by default 'admin').

This is a remnant from juno, where the swift dispersion user was in fact part of the keystone_admin_tenant.

Changing the dispersion.conf template to use:

auth_user = {{ swift_service_project_name }}:{{ swift_dispersion_user }}

instead of:

auth_user = {{ keystone_admin_tenant_name }}:{{ swift_dispersion_user }}

will allow swift-dispersion-report to work again.

No further change needed

[Darren Birkett (darren-birkett)]

master review: https://review.openstack.org/206572

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/206572
Committed: https://git.openstack.org/cgit/stackforge/os-ansible-deployment/commit/?id=23e796c344ba87f0ac6bee436a9b3d3ad4bfb269
Submitter: Jenkins
Branch: master

commit 23e796c344ba87f0ac6bee436a9b3d3ad4bfb269
Author: Darren Birkett <email address hidden>
Date: Tue Jul 28 15:55:20 2015 +0100

    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

[Darren Birkett (darren-birkett)]

kilo review: https://review.openstack.org/#/c/206913/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/206913
Committed: https://git.openstack.org/cgit/stackforge/os-ansible-deployment/commit/?id=c18a025e5a0d201f21a9a2097730f3030dd28b9a
Submitter: Jenkins
Branch: kilo

commit c18a025e5a0d201f21a9a2097730f3030dd28b9a
Author: Darren Birkett <email address hidden>
Date: Tue Jul 28 15:55:20 2015 +0100

    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
    (cherry picked from commit 23e796c344ba87f0ac6bee436a9b3d3ad4bfb269)

[Davanum Srinivas (DIMS) (dims-v)]

This issue was fixed in the openstack/openstack-ansible 11.2.11 release.

[Doug Hellmann (doug-hellmann)]

This issue was fixed in the openstack/openstack-ansible 11.2.12 release.

[Davanum Srinivas (DIMS) (dims-v)]

This issue was fixed in the openstack/openstack-ansible 11.2.14 release.