From 253158c9813d8789d9db073fc03ab81900609c06 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 22 Mar 2017 11:12:09 +0800 Subject: [PATCH] Deprecate auth_plugin option Option "auth_plugin" is deprecated, use option "auth_type" instead. Change-Id: Ia0baf16e37dd801143d3a16e505a87a9e8ecba02 Implements: blueprint deprecate-auth-plugin --- defaults/main.yml | 3 ++- .../notes/deprecate_auth_plugin-347b326919d67a18.yaml | 5 +++++ templates/metadata_agent.ini.j2 | 2 +- templates/neutron.conf.j2 | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/deprecate_auth_plugin-347b326919d67a18.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 204c32dd..661362d7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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: "" diff --git a/releasenotes/notes/deprecate_auth_plugin-347b326919d67a18.yaml b/releasenotes/notes/deprecate_auth_plugin-347b326919d67a18.yaml new file mode 100644 index 00000000..dced9374 --- /dev/null +++ b/releasenotes/notes/deprecate_auth_plugin-347b326919d67a18.yaml @@ -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. diff --git a/templates/metadata_agent.ini.j2 b/templates/metadata_agent.ini.j2 index 5ec7dfeb..f6dad454 100644 --- a/templates/metadata_agent.ini.j2 +++ b/templates/metadata_agent.ini.j2 @@ -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 }} diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index 3aefeab9..41562664 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -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 }}