openstack
/
openstack-ansible-os_designate
Code Issues Proposed changes

Get the adminuri variable from adminurl variable 

In order to clean variables in designate, the uri variable is removed,
and we filter url variable as needed

Change-Id: I537c963722553d798356287de3daefcad99ac62f
This commit is contained in:
Albert Mikaelyan 2018-02-27 18:50:58 +02:00
parent d525d5546b
commit 2950db130d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -131,11 +131,10 @@ 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_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ designate_service_port }}"
designate_service_adminuri: "{{ (designate_service_adminurl | default('http://localhost')) | netorigin }}"
designate_service_in_ldap: False