Merge "Add os_region_name to Trove configuration files"

ansible/roles/trove/templates/trove-conductor.conf.j2

@@ -8,6 +8,8 @@ control_exchange = trove
 
 transport_url = {{ rpc_transport_url }}
 
+os_region_name = {{ openstack_region_name }}
+
 [oslo_messaging_notifications]
 transport_url = {{ notify_transport_url }}
 

ansible/roles/trove/templates/trove-taskmanager.conf.j2

@@ -12,6 +12,8 @@ transport_url = {{ rpc_transport_url }}
 
 trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
 
+os_region_name = {{ openstack_region_name }}
+
 nova_compute_endpoint_type = internalURL
 neutron_endpoint_type = internalURL
 swift_endpoint_type = internalURL

ansible/roles/trove/templates/trove.conf.j2

@@ -14,6 +14,8 @@ transport_url = {{ rpc_transport_url }}
 
 trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
 
+os_region_name = {{ openstack_region_name }}
+
 nova_compute_endpoint_type = internalURL
 neutron_endpoint_type = internalURL
 swift_endpoint_type = internalURL