Merge pull request #469 from stackhpc/upstream/zed-2023-10-23

Synchronise zed with upstream
stackhpc · Oct 24, 2023 · 6416610 · 6416610
2 parents 144ba27 + 1de8b13
commit 6416610
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -889,7 +889,7 @@ fernet_token_allow_expired_window: 172800
 # expiry and allow expired window, multiple active keys will be necessary.
 fernet_key_rotation_interval: "{{ fernet_token_expiry + fernet_token_allow_expired_window }}"
 
-keystone_default_user_role: "_member_"
+keystone_default_user_role: "member"
 
 # OpenStack authentication string. You should only need to override these if you
 # are changing the admin tenant/project or user.

diff --git a/ansible/library/kolla_toolbox.py b/ansible/library/kolla_toolbox.py
@@ -93,7 +93,7 @@
         container_engine: docker
         module_name: os_keystone_role
         module_args:
-          name: _member_
+          name: member
           auth: "{{ '{{ openstack_keystone_auth }}' }}"
         module_extra_vars:
           openstack_keystone_auth:

diff --git a/...le/roles/common/filter_plugins/filters.py → ...on/filter_plugins/kolla_common_filters.py b/...le/roles/common/filter_plugins/filters.py → ...on/filter_plugins/kolla_common_filters.py
diff --git a/...roles/nova-cell/filter_plugins/filters.py → ...filter_plugins/kolla_nova_cell_filters.py b/...roles/nova-cell/filter_plugins/filters.py → ...filter_plugins/kolla_nova_cell_filters.py
diff --git a/releasenotes/notes/change-default-keystone-role-386974967adfed65.yaml b/releasenotes/notes/change-default-keystone-role-386974967adfed65.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Default keystone user role has been changed from deprecated role
+    ``_member_`` to ``member`` role.