Deprecate auth_plugin option
Option "auth_plugin" is deprecated, use option "auth_type" instead. Change-Id: Ia0baf16e37dd801143d3a16e505a87a9e8ecba02 Implements: blueprint deprecate-auth-plugin
This commit is contained in:
parent
e427a50499
commit
253158c981
@ -487,7 +487,8 @@ neutron_service_internalurl: "{{ neutron_service_internaluri }}"
|
|||||||
neutron_service_region: RegionOne
|
neutron_service_region: RegionOne
|
||||||
|
|
||||||
## Keystone authentication middleware
|
## Keystone authentication middleware
|
||||||
neutron_keystone_auth_plugin: password
|
neutron_keystone_auth_plugin: "{{ neutron_keystone_auth_type }}"
|
||||||
|
neutron_keystone_auth_type: password
|
||||||
|
|
||||||
## Agent
|
## Agent
|
||||||
neutron_external_network_bridge: ""
|
neutron_external_network_bridge: ""
|
||||||
|
@ -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.
|
@ -5,7 +5,7 @@
|
|||||||
debug = {{ debug }}
|
debug = {{ debug }}
|
||||||
|
|
||||||
# Neutron credentials for API access
|
# Neutron credentials for API access
|
||||||
auth_plugin = {{ neutron_keystone_auth_plugin }}
|
auth_type = {{ neutron_keystone_auth_plugin }}
|
||||||
auth_url = {{ keystone_service_adminurl }}
|
auth_url = {{ keystone_service_adminurl }}
|
||||||
auth_uri = {{ keystone_service_internaluri }}
|
auth_uri = {{ keystone_service_internaluri }}
|
||||||
auth_region = {{ keystone_service_region }}
|
auth_region = {{ keystone_service_region }}
|
||||||
|
@ -95,7 +95,7 @@ notify_nova_on_port_data_changes = True
|
|||||||
send_events_interval = 2
|
send_events_interval = 2
|
||||||
|
|
||||||
[nova]
|
[nova]
|
||||||
auth_plugin = {{ nova_keystone_auth_plugin }}
|
auth_type = {{ nova_keystone_auth_plugin }}
|
||||||
auth_url = {{ keystone_service_adminurl }}
|
auth_url = {{ keystone_service_adminurl }}
|
||||||
region_name = {{ nova_service_region }}
|
region_name = {{ nova_service_region }}
|
||||||
project_domain_id = {{ nova_service_project_domain_id }}
|
project_domain_id = {{ nova_service_project_domain_id }}
|
||||||
@ -127,7 +127,7 @@ quota_vip = {{ neutron_quota_vip }}
|
|||||||
# Keystone authentication
|
# Keystone authentication
|
||||||
[keystone_authtoken]
|
[keystone_authtoken]
|
||||||
insecure = {{ keystone_service_internaluri_insecure | bool }}
|
insecure = {{ keystone_service_internaluri_insecure | bool }}
|
||||||
auth_plugin = {{ neutron_keystone_auth_plugin }}
|
auth_type = {{ neutron_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 = {{ neutron_service_project_domain_id }}
|
project_domain_id = {{ neutron_service_project_domain_id }}
|
||||||
|
Loading…
Reference in New Issue
Block a user