openstack/openstack-ansible-os_octavia
Code Issues Proposed changes

Deprecate auth_plugin option

Browse Source 
Option "auth_plugin" is deprecated, use option "auth_type" instead.

Change-Id: Iebd56d49b05499748595a7f462a883244e890991
Implements: blueprint deprecate-auth-plugin
This commit is contained in:
ZhongShengping
2017-03-22 11:16:22 +08:00
parent 8263c52cfa
commit 2b63a40a79
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

@@ -99,7 +99,8 @@ octavia_service_user_name: "octavia"
octavia_service_role_name: admin octavia_service_role_name: admin
octavia_service_project_domain_id: default octavia_service_project_domain_id: default
octavia_service_user_domain_id: default octavia_service_user_domain_id: default
octavia_keystone_auth_plugin: password octavia_keystone_auth_plugin: "{{ octavia_keystone_auth_type }}"
octavia_keystone_auth_type: password
octavia_ansible_endpoint_type: "internal" # endpoint for ansible octavia_ansible_endpoint_type: "internal" # endpoint for ansible
## Trustee Auth ## Trustee Auth

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

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

2
templates/octavia.conf.j2
View File

@@ -58,7 +58,7 @@ event_streamer_driver = {% if octavia_event_streamer|bool %}queue_event_streamer
[keystone_authtoken] [keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }} insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ octavia_keystone_auth_plugin }} auth_type = {{ octavia_keystone_auth_plugin }}
auth_url = {{ keystone_service_internaluri }}/v3 auth_url = {{ keystone_service_internaluri }}/v3
auth_uri = {{ keystone_service_internaluri }}/v3 auth_uri = {{ keystone_service_internaluri }}/v3
auth_version = 3 auth_version = 3