Merge "[manila] Drop tenant_id templating from v2 endpoint"

ansible/roles/manila/defaults/main.yml

@@ -183,9 +183,9 @@ manila_admin_endpoint: "{{ manila_admin_base_endpoint }}/v1/%(tenant_id)s"
 manila_internal_endpoint: "{{ manila_internal_base_endpoint }}/v1/%(tenant_id)s"
 manila_public_endpoint: "{{ manila_public_base_endpoint }}/v1/%(tenant_id)s"
 
-manila_v2_admin_endpoint: "{{ manila_admin_base_endpoint }}/v2/%(tenant_id)s"
-manila_v2_internal_endpoint: "{{ manila_internal_base_endpoint }}/v2/%(tenant_id)s"
-manila_v2_public_endpoint: "{{ manila_public_base_endpoint }}/v2/%(tenant_id)s"
+manila_v2_admin_endpoint: "{{ manila_admin_base_endpoint }}/v2"
+manila_v2_internal_endpoint: "{{ manila_internal_base_endpoint }}/v2"
+manila_v2_public_endpoint: "{{ manila_public_base_endpoint }}/v2"
 
 manila_logging_debug: "{{ openstack_logging_debug }}"