summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-23 17:23:09 +0000
committerGerrit Code Review <review@openstack.org>2018-08-23 17:23:09 +0000
commitd7003936579ea3f93d998a0fda88d497f2d6d58b (patch)
tree6eaded7c972267501735d7f7124290b79ebf9935
parent08e8b51eafe2b324abf3889e778846de81a61cdd (diff)
parent77a106a85febf66929d0e5b5f317e8540ee95843 (diff)
Merge "Adapt to Keystone changes: use member instead of Member"
-rwxr-xr-xdevstack/upgrade/resources.sh2
-rw-r--r--doc/source/admin/advanced-configuration-guide.rst4
-rw-r--r--releasenotes/notes/proxy-user-lowercase-f116f7b7e89274cb.yaml6
-rw-r--r--sahara/utils/proxy.py2
4 files changed, 10 insertions, 4 deletions
diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index 2d7d4bd..3b0c886 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -59,7 +59,7 @@ function create_user {
59 resource_save sahara user_id $id 59 resource_save sahara user_id $id
60 60
61 # Workaround for bug: https://bugs.launchpad.net/keystone/+bug/1662911 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
65function create_keypair { 65function create_keypair {
diff --git a/doc/source/admin/advanced-configuration-guide.rst b/doc/source/admin/advanced-configuration-guide.rst
index 22c9f61..457e7a5 100644
--- a/doc/source/admin/advanced-configuration-guide.rst
+++ b/doc/source/admin/advanced-configuration-guide.rst
@@ -490,7 +490,7 @@ access. Please see the :keystone-doc:`Keystone documentation
490With the domain created, sahara's configuration file should be updated to 490With the domain created, sahara's configuration file should be updated to
491include the new domain name and any potential roles that will be needed. For 491include the new domain name and any potential roles that will be needed. For
492this example let's assume that the name of the proxy domain is 492this 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``SwiftUser``. 494``SwiftUser``.
495 495
496.. sourcecode:: cfg 496.. sourcecode:: cfg
@@ -498,7 +498,7 @@ this example let's assume that the name of the proxy domain is
498 [DEFAULT] 498 [DEFAULT]
499 use_domain_for_proxy_users=true 499 use_domain_for_proxy_users=true
500 proxy_user_domain_name=sahara_proxy 500 proxy_user_domain_name=sahara_proxy
501 proxy_user_role_names=Member,SwiftUser 501 proxy_user_role_names=member,SwiftUser
502 502
503A note on the use of roles. In the context of the proxy user, any roles 503A note on the use of roles. In the context of the proxy user, any roles
504specified here are roles intended to be delegated to the proxy user from the 504specified here are roles intended to be delegated to the proxy user from the
diff --git a/releasenotes/notes/proxy-user-lowercase-f116f7b7e89274cb.yaml b/releasenotes/notes/proxy-user-lowercase-f116f7b7e89274cb.yaml
new file mode 100644
index 0000000..6450739
--- /dev/null
+++ b/releasenotes/notes/proxy-user-lowercase-f116f7b7e89274cb.yaml
@@ -0,0 +1,6 @@
1---
2upgrade:
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).
diff --git a/sahara/utils/proxy.py b/sahara/utils/proxy.py
index 569f3e4..3fe2a5f 100644
--- a/sahara/utils/proxy.py
+++ b/sahara/utils/proxy.py
@@ -47,7 +47,7 @@ opts = [
47 help='The domain Sahara will use to create new proxy users ' 47 help='The domain Sahara will use to create new proxy users '
48 'for Swift object access.'), 48 'for Swift object access.'),
49 cfg.ListOpt('proxy_user_role_names', 49 cfg.ListOpt('proxy_user_role_names',
50 default=['Member'], 50 default=['member'],
51 help='A list of the role names that the proxy user should ' 51 help='A list of the role names that the proxy user should '
52 'assume through trust for Swift object access.') 52 'assume through trust for Swift object access.')
53] 53]