openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Disable haproxy when using external LB" into stable/stein

This commit is contained in:
Zuul 2019-11-06 23:29:51 +00:00 committed by Gerrit Code Review
parent 42ba2c65ef 03c614653a
commit f83dd8cf41
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/external-loadbalancer-vip-v6-all.yaml
View File

@ -14,6 +14,8 @@ resource_registry:
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool_v6.yaml
# Management network is optional and disabled by default
#OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool_v6.yaml
# We need to also disable the haproxy resource when using external lb
OS::TripleO::Services::HAproxy: OS::Heat::None
parameter_defaults:
# When using an external loadbalancer set the following in parameter_defaults

2
environments/external-loadbalancer-vip-v6.yaml
View File

@ -12,6 +12,8 @@ resource_registry:
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
# Management network is optional and disabled by default
#OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool_v6.yaml
# We need to also disable the haproxy resource when using external lb
OS::TripleO::Services::HAproxy: OS::Heat::None
parameter_defaults:
# When using an external loadbalancer set the following in parameter_defaults

2
environments/external-loadbalancer-vip.yaml
View File

@ -11,6 +11,8 @@ resource_registry:
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
# Management network is optional and disabled by default
#OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool.yaml
# We need to also disable the haproxy resource when using external lb
OS::TripleO::Services::HAproxy: OS::Heat::None
parameter_defaults:
# When using an external loadbalancer set the following in parameter_defaults