openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Make sure we add all_nodes_extra_map_data to all_nodes"

This commit is contained in:
Zuul 2019-11-28 23:38:06 +00:00 committed by Gerrit Code Review
parent d4ec96a09c 7385d5e4c5
commit 3c80d51b92
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tripleo_ansible/roles/tripleo-hieradata/templates/all_nodes.j2
View File

@ -36,10 +36,19 @@
{% for key, value in service_net_map.items() %}
{% set _ = all_nodes.__setitem__(key, value) %}
{% endfor %}
{% if 'redis' in all_enabled_services %}
{% set _ = all_nodes.__setitem__('redis_vip', (net_vip_map.redis)) %}
{% if nova_additional_cell %}
{% for key, value in all_nodes_extra_map_data.items() %}
{% set _ = all_nodes.__setitem__(key, value) %}
{% endfor %}
{% endif %}
{% if 'ovn_dbs' in all_enabled_services %}
{% if 'redis' in all_enabled_services or nova_additional_cell %}
{% if 'redis_vip' in all_nodes_extra_map_data %}
{% set _ = all_nodes.__setitem__('redis_vip', all_nodes_extra_map_data['redis_vip']) %}
{% elif net_vip_map.redis is defined %}
{% set _ = all_nodes.__setitem__('redis_vip', (net_vip_map.redis)) %}
{% endif %}
{% endif %}
{% if 'ovn_dbs' in all_enabled_services or nova_additional_cell %}
{% if 'ovn_dbs_vip' in all_nodes_extra_map_data %}
{% set _ = all_nodes.__setitem__('ovn_dbs_vip', all_nodes_extra_map_data['ovn_dbs_vip']) %}
{% elif net_vip_map.ovn_dbs is defined %}