From 486adbe215b1693e6627b4262c24ccf791c7b6e8 Mon Sep 17 00:00:00 2001 From: Steve Lewis Date: Thu, 31 Mar 2016 13:54:24 -0700 Subject: [PATCH] Include reseller admin role correctly The name of the reseller_admin_role in the proxy config needs to map to the correct role within the deploy. It was specified manually and inconsistently though a variable exists in the role defaults. Change-Id: Ib93fc57f1e26e8a0943a7bd7c2212ce94be54f7c Closes-Bug: #1542391 --- templates/proxy-server.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/proxy-server.conf.j2 b/templates/proxy-server.conf.j2 index 0f559e69..511888f1 100644 --- a/templates/proxy-server.conf.j2 +++ b/templates/proxy-server.conf.j2 @@ -95,19 +95,19 @@ delay_auth_decision = {{ swift_delay_auth_decision }} use = egg:swift#keystoneauth {% if swift_allow_all_users is defined and swift_allow_all_users == True %} {% if 'ceilometer' in swift_middleware_list %} -operator_roles = admin, swiftoperator, _member_, ResellerAdmin +operator_roles = admin, swiftoperator, _member_, {{ swift_reselleradmin_role }} {% else %} operator_roles = admin, swiftoperator, _member_ {% endif %} {% else %} {% if 'ceilometer' in swift_middleware_list %} -operator_roles = admin, swiftoperator, ResellerAdmin +operator_roles = admin, swiftoperator, {{ swift_reselleradmin_role }} {% else %} operator_roles = admin, swiftoperator {% endif %} {% endif %} # The reseller admin role has the ability to create and delete accounts -reseller_admin_role = reseller_admin +reseller_admin_role = {{ swift_reselleradmin_role }} {% endif %} [filter:healthcheck]