Skip to content

Commit

Permalink
Add default user role for Keystone & Horizon and tasks to create it
Browse files Browse the repository at this point in the history
In Keystone v3, the _member_ role is not implicitly created on first
use like it is in v2.

This patch adds variables to define the default role name for users:
 - keystone_default_role_name:
   this is the default role name from Keystone's point of view
 - horizon_default_role_name:
   this is the default user role from Horizon's point of view

Both Keystone and Horizon's tasks ensure that the role they're using
are registered in the Keystone database.

To maintain backwards compatibility the default value for both
variables is '_member_'.

DocImpact
Closes-bug: 1474916
Change-Id: Ie01e1771c0b435815dfe55fc0ba9a6d803ebe958
(cherry picked from commit e96a86a)
  • Loading branch information
sigmavirus24 authored and Jesse Pretorius committed Aug 27, 2015
1 parent 734aeee commit 693016a
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 1 deletion.
3 changes: 3 additions & 0 deletions playbooks/roles/os_horizon/defaults/main.yml
Expand Up @@ -91,6 +91,9 @@ horizon_keystone_endpoint: "{{ keystone_service_internalurl }}"
## alternatively, you can set horizon to turn off ssl verification for Keystone
horizon_ssl_no_verify: "{{ (keystone_service_adminuri_insecure | bool or keystone_service_internaluri_insecure | bool) | default(false) }}"

## The role which Horizon should use as a default for users
horizon_default_role_name: _member_

## Launch instance
horizon_launch_instance_legacy: True
horizon_launch_instance_ng: False
Expand Down
34 changes: 34 additions & 0 deletions playbooks/roles/os_horizon/tasks/horizon_service_setup.yml
@@ -0,0 +1,34 @@
---
# Copyright 2015, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


# Add the default user role
- name: Ensure default keystone user role
keystone:
command: "ensure_role"
token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}"
role_name: "{{ horizon_default_role_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
when: >
keystone_auth_admin_token is defined
and keystone_service_adminurl is defined
and keystone_service_adminuri_insecure is defined
register: add_member_role
until: add_member_role|success
retries: 5
delay: 10
tags:
- horizon-member-config
2 changes: 2 additions & 0 deletions playbooks/roles/os_horizon/tasks/main.yml
Expand Up @@ -28,6 +28,8 @@
- include: horizon_ssl_user_provided.yml

- include: horizon_service_setup.yml

- include: horizon_apache.yml

- name: Flush handlers
Expand Down
Expand Up @@ -168,7 +168,8 @@ OPENSTACK_HOST = "{{ horizon_keystone_host }}"
OPENSTACK_KEYSTONE_URL = "{{ horizon_keystone_endpoint }}"
{% endif %}

OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_"
# The default role assigned to users
OPENSTACK_KEYSTONE_DEFAULT_ROLE = "{{ horizon_default_role_name }}"

{% if keystone_sp is defined %}
# Enables keystone web single-sign-on
Expand Down
1 change: 1 addition & 0 deletions playbooks/roles/os_keystone/defaults/main.yml
Expand Up @@ -80,6 +80,7 @@ keystone_database_pool_timeout: 120

## Role info
keystone_role_name: admin
keystone_default_role_name: _member_

## Admin info
keystone_admin_port: 35357
Expand Down
16 changes: 16 additions & 0 deletions playbooks/roles/os_keystone/tasks/keystone_service_setup.yml
Expand Up @@ -128,6 +128,22 @@
- keystone-api-setup
- keystone-setup

# Add the default user role
- name: Ensure default keystone user role
keystone:
command: "ensure_role"
token: "{{ keystone_auth_admin_token }}"
endpoint: "{{ keystone_service_adminurl }}"
role_name: "{{ keystone_default_role_name }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_member_role
until: add_member_role|success
retries: 5
delay: 10
tags:
- keystone-api-setup
- keystone-setup

# Create a service
- name: Ensure Keystone Service
keystone:
Expand Down
1 change: 1 addition & 0 deletions playbooks/roles/os_keystone/templates/keystone.conf.j2
Expand Up @@ -9,6 +9,7 @@ public_endpoint = {{ keystone_public_endpoint }}
{% endif %}
admin_endpoint = {{ keystone_service_adminuri }}
fatal_deprecations = {{ keystone_fatal_deprecations }}
member_role_name = {{ keystone_default_role_name }}

{% if keystone_ssl | bool and keystone_secure_proxy_ssl_header is defined %}
secure_proxy_ssl_header = {{ keystone_secure_proxy_ssl_header }}
Expand Down

0 comments on commit 693016a

Please sign in to comment.