openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update trove config file"

Browse Source
This commit is contained in:
Zuul 2020-07-22 12:32:42 +00:00 committed by Gerrit Code Review
commit 8519ceb443
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 }}
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 }}

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 }}
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

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

@ -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 }}