Merge "Compute VIPs using net_vip_map instead of hiera"
This commit is contained in:
commit
8fbb53d01c
|
@ -43,21 +43,24 @@
|
||||||
|
|
||||||
- name: set dashboard_vip variable if dashboard is enabled
|
- name: set dashboard_vip variable if dashboard is enabled
|
||||||
block:
|
block:
|
||||||
- name: get the frontend_dashboard_vip from the overcloud vars
|
|
||||||
command: "hiera -c /etc/puppet/hiera.yaml ceph_dashboard_vip"
|
|
||||||
register: frontend_vip
|
|
||||||
become: true
|
|
||||||
delegate_to: "{{ groups['mgrs'][0] }}"
|
|
||||||
- name: set dashboard_frontend variable
|
- name: set dashboard_frontend variable
|
||||||
set_fact:
|
set_fact:
|
||||||
ceph_ansible_group_vars_all: "{{ ceph_ansible_group_vars_all | combine({ 'dashboard_frontend_vip': dashboard_vip | default() }) }}"
|
ceph_ansible_group_vars_all: "{{ ceph_ansible_group_vars_all | combine({ 'dashboard_frontend_vip': dashboard_vip | default() })
|
||||||
|
| combine({ 'prometheus_frontend_vip': monitoring_stack_vip | default()})
|
||||||
|
| combine({ 'alertmanager_frontend_vip': monitoring_stack_vip | default()}) }}"
|
||||||
vars:
|
vars:
|
||||||
dashboard_vip: |-
|
dashboard_vip: |-
|
||||||
{% set dashboard_vip = control_virtual_ip %}
|
{% set dashboard_vip = control_virtual_ip %}
|
||||||
{% if frontend_vip.stdout != "nil" %}
|
{% if 'StorageDashboard' in enabled_networks %}
|
||||||
{% set dashboard_vip = frontend_vip.stdout %}
|
{% set dashboard_vip = net_vip_map.get('storage_dashboard') %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ dashboard_vip }}
|
{{ dashboard_vip }}
|
||||||
|
monitoring_stack_vip: |-
|
||||||
|
{% set monitoring_vip = control_virtual_ip %}
|
||||||
|
{% if 'Storage' in enabled_networks %}
|
||||||
|
{% set monitoring_vip = net_vip_map.get('storage') %}
|
||||||
|
{% endif %}
|
||||||
|
{{ monitoring_vip }}
|
||||||
when:
|
when:
|
||||||
- tripleo_enabled_services | intersect(['ceph_grafana'])
|
- tripleo_enabled_services | intersect(['ceph_grafana'])
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue