Merge "Move away from "tenant_id" endpoints for Nova"

This commit is contained in:
Jenkins 2017-03-10 14:04:55 +00:00 committed by Gerrit Code Review
commit 670e6992d9

View File

@ -172,11 +172,11 @@ nova_rabbitmq_vhost: /nova
nova_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" nova_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
nova_program_name: nova-api-os-compute nova_program_name: nova-api-os-compute
nova_service_adminuri: "http://{{ test_nova_api_compute_host }}:8774" nova_service_adminuri: "http://{{ test_nova_api_compute_host }}:8774"
nova_service_adminurl: "{{ nova_service_adminuri }}/v2.1/%(tenant_id)s" nova_service_adminurl: "{{ nova_service_adminuri }}/v2.1"
nova_service_publicuri: "http://{{ test_nova_api_compute_host }}:8774" nova_service_publicuri: "http://{{ test_nova_api_compute_host }}:8774"
nova_service_publicurl: "{{ nova_service_publicuri }}/v2.1/%(tenant_id)s" nova_service_publicurl: "{{ nova_service_publicuri }}/v2.1"
nova_service_internaluri: "http://{{ test_nova_api_compute_host }}:8774" nova_service_internaluri: "http://{{ test_nova_api_compute_host }}:8774"
nova_service_internalurl: "{{ nova_service_internaluri }}/v2.1/%(tenant_id)s" nova_service_internalurl: "{{ nova_service_internaluri }}/v2.1"
nova_spice_html5proxy_base_uri: "http://{{ test_nova_console_host }}:6082" nova_spice_html5proxy_base_uri: "http://{{ test_nova_console_host }}:6082"
nova_spice_html5proxy_base_url: "{{ nova_spice_html5proxy_base_uri }}/spice_auto.html" nova_spice_html5proxy_base_url: "{{ nova_spice_html5proxy_base_uri }}/spice_auto.html"
nova_service_password: "secrete" nova_service_password: "secrete"