From 2950db130db08b4c6662551d0d6e24ac8ba0bb1a Mon Sep 17 00:00:00 2001 From: Albert Mikaelyan Date: Tue, 27 Feb 2018 18:50:58 +0200 Subject: [PATCH] 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 --- defaults/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 41c7a48..84673c5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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