openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Deprecate auth_plugin option

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

Change-Id: Ia0baf16e37dd801143d3a16e505a87a9e8ecba02
Implements: blueprint deprecate-auth-plugin
This commit is contained in:
ZhongShengping 2017-03-22 11:12:09 +08:00
parent e427a50499
commit 253158c981
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -487,7 +487,8 @@ neutron_service_internalurl: "{{ neutron_service_internaluri }}"
neutron_service_region: RegionOne
## Keystone authentication middleware
neutron_keystone_auth_plugin: password
neutron_keystone_auth_plugin: "{{ neutron_keystone_auth_type }}"
neutron_keystone_auth_type: password
## Agent
neutron_external_network_bridge: ""

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

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

2
templates/metadata_agent.ini.j2
View File

@ -5,7 +5,7 @@
debug = {{ debug }}
# Neutron credentials for API access
auth_plugin = {{ neutron_keystone_auth_plugin }}
auth_type = {{ neutron_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminurl }}
auth_uri = {{ keystone_service_internaluri }}
auth_region = {{ keystone_service_region }}

4
templates/neutron.conf.j2
View File

@ -95,7 +95,7 @@ notify_nova_on_port_data_changes = True
send_events_interval = 2
[nova]
auth_plugin = {{ nova_keystone_auth_plugin }}
auth_type = {{ nova_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminurl }}
region_name = {{ nova_service_region }}
project_domain_id = {{ nova_service_project_domain_id }}
@ -127,7 +127,7 @@ quota_vip = {{ neutron_quota_vip }}
# Keystone authentication
[keystone_authtoken]
insecure = {{ keystone_service_internaluri_insecure | bool }}
auth_plugin = {{ neutron_keystone_auth_plugin }}
auth_type = {{ neutron_keystone_auth_plugin }}
auth_url = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }}
project_domain_id = {{ neutron_service_project_domain_id }}