openstack
/
openstack-ansible-os_designate
Code Issues Proposed changes

Merge "Revert "Get the adminuri variable from adminurl variable""

This commit is contained in:
Zuul 2019-02-09 04:06:45 +00:00 committed by Gerrit Code Review
parent 9b349ca222 34fdbcf9b0
commit 78d374db48
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -185,10 +185,11 @@ designate_service_project_name: service
designate_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(designate_service_proto) }}"
designate_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(designate_service_proto) }}"
designate_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(designate_service_proto) }}"
designate_service_publicuri: "{{ designate_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ designate_service_port }}"
designate_service_internaluri: "{{ designate_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ designate_service_port }}"
designate_service_adminuri: "{{ (designate_service_adminurl | default('http://localhost')) | netorigin }}"
designate_service_adminuri: "{{ designate_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ designate_service_port }}"
designate_service_in_ldap: False