Browse Source

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

Zuul 2 months ago
parent
commit
78d374db48
1 changed files with 2 additions and 1 deletions
  1. 2
    1
      defaults/main.yml

+ 2
- 1
defaults/main.yml View File

@@ -185,10 +185,11 @@ designate_service_project_name: service
185 185
 
186 186
 designate_service_publicuri_proto: "{{ openstack_service_publicuri_proto | default(designate_service_proto) }}"
187 187
 designate_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(designate_service_proto) }}"
188
+designate_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(designate_service_proto) }}"
188 189
 
189 190
 designate_service_publicuri: "{{ designate_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ designate_service_port }}"
190 191
 designate_service_internaluri: "{{ designate_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ designate_service_port }}"
191
-designate_service_adminuri: "{{ (designate_service_adminurl | default('http://localhost')) | netorigin }}"
192
+designate_service_adminuri: "{{ designate_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ designate_service_port }}"
192 193
 
193 194
 designate_service_in_ldap: False
194 195
 

Loading…
Cancel
Save