Move away from "tenant_id" endpoints

We shouldn't need "tenant_id" section in the endpoints anymore, so this
patch removes them.

NB We will need to adjust the integrated build and tests repo to set
these vars before this patch can merge - we shouldn't have to set these
in"os-nova_overrides.yml".

Change-Id: Ia4c8f8a35f494c0a07cbac4cbec43271d25f9511
Depends-On: Ifce740ca88683241341961604eb26fdf67f16d35
Depends-On: I5208597bba670f04b82235a81c8288cea3dbd893
This commit is contained in:
Andy McCrae 2017-03-09 15:47:48 +00:00 committed by Andy McCrae
parent 80b800e1cc
commit 700ff8ebef

View File

@ -209,11 +209,11 @@ nova_service_internaluri_proto: "{{ openstack_service_internaluri_proto | defaul
nova_service_port: 8774
nova_service_description: "Nova Compute Service"
nova_service_publicuri: "{{ nova_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ nova_service_port }}"
nova_service_publicurl: "{{ nova_service_publicuri }}/v2.1/%(tenant_id)s"
nova_service_publicurl: "{{ nova_service_publicuri }}/v2.1"
nova_service_adminuri: "{{ nova_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ nova_service_port }}"
nova_service_adminurl: "{{ nova_service_adminuri }}/v2.1/%(tenant_id)s"
nova_service_adminurl: "{{ nova_service_adminuri }}/v2.1"
nova_service_internaluri: "{{ nova_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ nova_service_port }}"
nova_service_internalurl: "{{ nova_service_internaluri }}/v2.1/%(tenant_id)s"
nova_service_internalurl: "{{ nova_service_internaluri }}/v2.1"
## Nova cinder
nova_cross_az_attach: True