Browse Source

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

tags/10.0.0.0b1
Zuul 10 months ago
parent
commit
d700393657

+ 1
- 1
devstack/upgrade/resources.sh View File

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

+ 2
- 2
doc/source/admin/advanced-configuration-guide.rst View File

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

+ 6
- 0
releasenotes/notes/proxy-user-lowercase-f116f7b7e89274cb.yaml View File

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

+ 1
- 1
sahara/utils/proxy.py View File

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

Loading…
Cancel
Save