openstack/tripleo-heat-templates
Code Issues Proposed changes

Disable haproxy when using external LB

Browse Source 
This change ensures the update_tasks.yaml is
generated without the haproxy sections which will cause issues since
there is no haproxy-bundle resource in external LB environments.

Change-Id: I716aaa0be7b23bc3be2b1b755c75bd9173930da0
Closes-Bug: #1851297
This commit is contained in:
Brendan 2019-11-05 06:50:59 +10:00
parent ad27bcc3ea
commit 14228a33d5
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

@ -15,6 +15,8 @@ resource_registry:
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool_v6.yaml OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool_v6.yaml
# Management network is optional and disabled by default # Management network is optional and disabled by default
#OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool_v6.yaml #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: parameter_defaults:
# When using an external loadbalancer set the following in parameter_defaults # When using an external loadbalancer set the following in parameter_defaults

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

@ -13,6 +13,8 @@ resource_registry:
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
# Management network is optional and disabled by default # Management network is optional and disabled by default
#OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool_v6.yaml #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: parameter_defaults:
# When using an external loadbalancer set the following in parameter_defaults # When using an external loadbalancer set the following in parameter_defaults

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

@ -12,6 +12,8 @@ resource_registry:
OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml OS::TripleO::Controller::Ports::TenantPort: ../network/ports/tenant_from_pool.yaml
# Management network is optional and disabled by default # Management network is optional and disabled by default
#OS::TripleO::Controller::Ports::ManagementPort: ../network/ports/management_from_pool.yaml #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: parameter_defaults:
# When using an external loadbalancer set the following in parameter_defaults # When using an external loadbalancer set the following in parameter_defaults