openstack/openstack-ansible-os_trove
Code Issues Proposed changes

Merge "Deprecate auth_plugin option"

Browse Source
This commit is contained in:
Jenkins
2017-03-30 21:49:53 +00:00
committed by Gerrit Code Review
parent 9e234166c4 6a55fccd31
commit 83adc96f1b
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@@ -127,7 +127,8 @@ trove_rabbitmq_port: 5672
trove_rabbitmq_servers: "{{ rabbitmq_servers }}" trove_rabbitmq_servers: "{{ rabbitmq_servers }}"
# Keystone AuthToken/Middleware # Keystone AuthToken/Middleware
trove_keystone_auth_plugin: password trove_keystone_auth_plugin: "{{ trove_keystone_auth_type }}"
trove_keystone_auth_type: password
trove_service_project_domain_name: Default trove_service_project_domain_name: Default
trove_service_user_domain_name: default trove_service_user_domain_name: default
trove_service_project_domain_id: default trove_service_project_domain_id: default

5
releasenotes/notes/deprecate_auth_plugin-451832a71b967e27.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
deprecations:
- The ``trove_keystone_auth_plugin`` variable has been deprecated.
``trove_keystone_auth_type`` should be used instead to configure
authentication type.

2
templates/trove.conf.j2
View File

@@ -76,7 +76,7 @@ api_paste_config = api-paste.ini
[keystone_authtoken] [keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }} insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ trove_keystone_auth_plugin }} auth_type = {{ trove_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }} auth_uri = {{ keystone_service_internaluri }}
project_domain_id = {{ trove_service_project_domain_id }} project_domain_id = {{ trove_service_project_domain_id }}