Merge "Fall back public_virtual_ip to ctlplane if External net not present"
This commit is contained in:
commit
eb5b6952c2
@ -200,7 +200,11 @@ resources:
|
||||
get_param: [NetVipMap, {get_param: [ServiceNetMap, keystone_admin_api_network]}]
|
||||
keystone_public_api_vip:
|
||||
get_param: [NetVipMap, {get_param: [ServiceNetMap, keystone_public_api_network]}]
|
||||
{%- if 'External' in _networks %}
|
||||
public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
|
||||
{%- else %}
|
||||
public_virtual_ip: {get_param: [NetVipMap, ctlplane]}
|
||||
{%- endif %}
|
||||
controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
|
||||
{%- if 'InternalApi' in _networks %}
|
||||
# the internal_api_virtual_ip is needed for contrail only
|
||||
@ -222,9 +226,14 @@ resources:
|
||||
{%- endfor %}
|
||||
# public_virtual_ip and controller_virtual_ip are needed in
|
||||
# both HAproxy & keepalived.
|
||||
{%- if 'External' in _networks %}
|
||||
tripleo::haproxy::public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
|
||||
tripleo::haproxy::controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
|
||||
tripleo::keepalived::public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
|
||||
{%- else %}
|
||||
tripleo::haproxy::public_virtual_ip: {get_param: [NetVipMap, ctlplane]}
|
||||
tripleo::keepalived::public_virtual_ip: {get_param: [NetVipMap, ctlplane]}
|
||||
{%- endif %}
|
||||
tripleo::haproxy::controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
|
||||
tripleo::keepalived::controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
|
||||
tripleo::keepalived::redis_virtual_ip: {get_param: RedisVirtualIP}
|
||||
tripleo::redis_notification::haproxy_monitor_ip: {get_param: [NetVipMap, ctlplane]}
|
||||
|
Loading…
x
Reference in New Issue
Block a user