Merge "Adapt to Keystone changes: use member instead of Member"

This commit is contained in:
Zuul 2018-08-23 17:23:09 +00:00 committed by Gerrit Code Review
commit d700393657
4 changed files with 10 additions and 4 deletions

View File

@ -59,7 +59,7 @@ function create_user {
resource_save sahara user_id $id
# Workaround for bug: https://bugs.launchpad.net/keystone/+bug/1662911
openstack role add Member --user $id --project $project_id
openstack role add member --user $id --project $project_id
}
function create_keypair {

View File

@ -490,7 +490,7 @@ access. Please see the :keystone-doc:`Keystone documentation
With the domain created, sahara's configuration file should be updated to
include the new domain name and any potential roles that will be needed. For
this example let's assume that the name of the proxy domain is
``sahara_proxy`` and the roles needed by proxy users will be ``Member`` and
``sahara_proxy`` and the roles needed by proxy users will be ``member`` and
``SwiftUser``.
.. sourcecode:: cfg
@ -498,7 +498,7 @@ this example let's assume that the name of the proxy domain is
[DEFAULT]
use_domain_for_proxy_users=true
proxy_user_domain_name=sahara_proxy
proxy_user_role_names=Member,SwiftUser
proxy_user_role_names=member,SwiftUser
A note on the use of roles. In the context of the proxy user, any roles
specified here are roles intended to be delegated to the proxy user from the

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The default proxy role for Swift is now member instead of Member.
Keystone now creates the former by default,
even if the latter is recognized to be the same (case preserving).

View File

@ -47,7 +47,7 @@ opts = [
help='The domain Sahara will use to create new proxy users '
'for Swift object access.'),
cfg.ListOpt('proxy_user_role_names',
default=['Member'],
default=['member'],
help='A list of the role names that the proxy user should '
'assume through trust for Swift object access.')
]