From 712b27daea958094d3aae6b1df26c391fe8e4200 Mon Sep 17 00:00:00 2001 From: likui Date: Mon, 20 Jul 2020 20:18:35 +0800 Subject: [PATCH] Update trove config file Option "trove_auth_url/os_region_name" from group "DEFAULT" is deprecated. Use option "auth_url/region_name" from group service_credentials Change-Id: I15d6891582c92c7fc813f280a2b47ebaaca77eba --- .../roles/trove/templates/trove-conductor.conf.j2 | 10 ++++++++-- .../roles/trove/templates/trove-taskmanager.conf.j2 | 13 +++++++++---- ansible/roles/trove/templates/trove.conf.j2 | 13 +++++++++---- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ansible/roles/trove/templates/trove-conductor.conf.j2 b/ansible/roles/trove/templates/trove-conductor.conf.j2 index a995eac5bc..63bcbff06d 100644 --- a/ansible/roles/trove/templates/trove-conductor.conf.j2 +++ b/ansible/roles/trove/templates/trove-conductor.conf.j2 @@ -2,13 +2,19 @@ debug = {{ trove_logging_debug }} log_dir = /var/log/kolla/trove -trove_auth_url = {{ keystone_internal_url }}/v3 conductor_manager = trove.conductor.manager.Manager control_exchange = trove transport_url = {{ rpc_transport_url }} -os_region_name = {{ openstack_region_name }} +[service_credentials] +auth_url = {{ keystone_internal_url }}/v3 +region_name = {{ openstack_region_name }} +project_name = service +password = {{ trove_keystone_password }} +project_domain_name = {{ default_project_domain_name }} +user_domain_name = {{ default_user_domain_name }} +username = {{ trove_keystone_user }} [oslo_messaging_notifications] transport_url = {{ notify_transport_url }} diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2 index 685b07966a..761433b479 100644 --- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 +++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2 @@ -15,10 +15,6 @@ taskmanager_manager = trove.taskmanager.manager.Manager transport_url = {{ rpc_transport_url }} -trove_auth_url = {{ keystone_internal_url }}/v3 - -os_region_name = {{ openstack_region_name }} - nova_compute_endpoint_type = internalURL neutron_endpoint_type = internalURL cinder_endpoint_type = internalURL @@ -30,6 +26,15 @@ network_driver = trove.network.neutron.NeutronDriver network_label_regex = .* +[service_credentials] +auth_url = {{ keystone_internal_url }}/v3 +region_name = {{ openstack_region_name }} +project_name = service +password = {{ trove_keystone_password }} +project_domain_name = {{ default_project_domain_name }} +user_domain_name = {{ default_user_domain_name }} +username = {{ trove_keystone_user }} + [database] connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }} max_retries = -1 diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2 index c35b24ee39..99f3eeea1d 100644 --- a/ansible/roles/trove/templates/trove.conf.j2 +++ b/ansible/roles/trove/templates/trove.conf.j2 @@ -12,10 +12,6 @@ auth_strategy = keystone transport_url = {{ rpc_transport_url }} -trove_auth_url = {{ keystone_internal_url }}/v3 - -os_region_name = {{ openstack_region_name }} - nova_compute_endpoint_type = internalURL neutron_endpoint_type = internalURL cinder_endpoint_type = internalURL @@ -27,6 +23,15 @@ network_driver = trove.network.neutron.NeutronDriver network_label_regex = .* +[service_credentials] +auth_url = {{ keystone_internal_url }}/v3 +region_name = {{ openstack_region_name }} +project_name = service +password = {{ trove_keystone_password }} +project_domain_name = {{ default_project_domain_name }} +user_domain_name = {{ default_user_domain_name }} +username = {{ trove_keystone_user }} + [database] connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}