Merge "Fix sahara endpoint url"

This commit is contained in:
Jenkins 2016-10-04 21:44:04 +00:00 committed by Gerrit Code Review
commit c9cbadcf40

View File

@ -25,9 +25,9 @@ sahara_api_image_full: "{{ sahara_api_image }}:{{ sahara_api_tag }}"
####################
# OpenStack
####################
sahara_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ sahara_api_port }}"
sahara_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ sahara_api_port }}"
sahara_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ sahara_api_port }}"
sahara_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ sahara_api_port }}/v1.1/%(tenant_id)s"
sahara_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ sahara_api_port }}/v1.1/%(tenant_id)s"
sahara_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ sahara_api_port }}/v1.1/%(tenant_id)s"
sahara_logging_debug: "{{ openstack_logging_debug }}"