Merge "Add composable network VIPs for puppet configuration"

This commit is contained in:
Zuul 2018-01-09 01:56:54 +00:00 committed by Gerrit Code Review
commit 3922a3f423
2 changed files with 17 additions and 0 deletions

View File

@ -184,7 +184,19 @@ resources:
public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
{%- for network in networks if network.vip|default(false) %}
# TODO - remove these when puppet-tripleo patch https://review.openstack.org/#/c/531037 merges
# the internal_api_virtual_ip will still be needed for now however, as its used by contrail
{{network.name_lower}}_virtual_ip: {get_param: [NetVipMap, {get_param: {{network.name}}NetName}]}
{%- endfor %}
network_virtual_ips:
{% set count = 1 %}
{%- for network in networks if network.vip|default(false) %}
{%- if network.name != 'External' %}
{{network.name_lower}}:
ip_address: {get_param: [NetVipMap, {get_param: {{network.name}}NetName}]}
index: {{count}}
{% set count = count + 1 %}
{%- endif %}
{%- endfor %}
redis_vip: {get_param: RedisVirtualIP}
# public_virtual_ip and controller_virtual_ip are needed in
@ -193,6 +205,7 @@ resources:
tripleo::haproxy::controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
tripleo::keepalived::public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
tripleo::keepalived::controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
# TODO - remove virtual_ips when puppet-tripleo patch https://review.openstack.org/#/c/531037 merges
tripleo::keepalived::internal_api_virtual_ip: {get_param: [NetVipMap, {get_param: InternalApiNetName}]}
tripleo::keepalived::storage_virtual_ip: {get_param: [NetVipMap, {get_param: StorageNetName}]}
tripleo::keepalived::storage_mgmt_virtual_ip: {get_param: [NetVipMap, {get_param: StorageMgmtNetName}]}

View File

@ -0,0 +1,4 @@
---
fixes:
- Added hiera for network_virtual_ips in vip_data to allow
composable networks to be configured in puppet.