openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Compute VIPs using net_vip_map instead of hiera" into stable/victoria

This commit is contained in:
Zuul 2021-04-26 13:24:06 +00:00 committed by Gerrit Code Review
parent fb2fd1a58b 671fd4e441
commit 985e7a9f94
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/prepare.yml
View File

@ -45,21 +45,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'])