openstack/kolla-ansible
Code Issues Proposed changes

Update trove config file

Browse Source 
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
This commit is contained in:
likui 2020-07-20 20:18:35 +08:00
parent f81aee5094
commit 712b27daea
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/roles/trove/templates/trove-conductor.conf.j2
View File

@ -2,13 +2,19 @@
debug = {{ trove_logging_debug }} debug = {{ trove_logging_debug }}
log_dir = /var/log/kolla/trove log_dir = /var/log/kolla/trove
trove_auth_url = {{ keystone_internal_url }}/v3
conductor_manager = trove.conductor.manager.Manager conductor_manager = trove.conductor.manager.Manager
control_exchange = trove control_exchange = trove
transport_url = {{ rpc_transport_url }} 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] [oslo_messaging_notifications]
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}

13
ansible/roles/trove/templates/trove-taskmanager.conf.j2
View File

@ -15,10 +15,6 @@ taskmanager_manager = trove.taskmanager.manager.Manager
transport_url = {{ rpc_transport_url }} transport_url = {{ rpc_transport_url }}
trove_auth_url = {{ keystone_internal_url }}/v3
os_region_name = {{ openstack_region_name }}
nova_compute_endpoint_type = internalURL nova_compute_endpoint_type = internalURL
neutron_endpoint_type = internalURL neutron_endpoint_type = internalURL
cinder_endpoint_type = internalURL cinder_endpoint_type = internalURL
@ -30,6 +26,15 @@ network_driver = trove.network.neutron.NeutronDriver
network_label_regex = .* 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] [database]
connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }} connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}
max_retries = -1 max_retries = -1

13
ansible/roles/trove/templates/trove.conf.j2
View File

@ -12,10 +12,6 @@ auth_strategy = keystone
transport_url = {{ rpc_transport_url }} transport_url = {{ rpc_transport_url }}
trove_auth_url = {{ keystone_internal_url }}/v3
os_region_name = {{ openstack_region_name }}
nova_compute_endpoint_type = internalURL nova_compute_endpoint_type = internalURL
neutron_endpoint_type = internalURL neutron_endpoint_type = internalURL
cinder_endpoint_type = internalURL cinder_endpoint_type = internalURL
@ -27,6 +23,15 @@ network_driver = trove.network.neutron.NeutronDriver
network_label_regex = .* 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] [database]
connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }} connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}