Browse Source

Disable haproxy when using external LB

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
(cherry picked from commit 14228a33d5)
changes/53/693053/1
Brendan 3 months ago
parent
commit
674a79c7e8
3 changed files with 6 additions and 0 deletions
  1. +2
    -0
      environments/external-loadbalancer-vip-v6-all.yaml
  2. +2
    -0
      environments/external-loadbalancer-vip-v6.yaml
  3. +2
    -0
      environments/external-loadbalancer-vip.yaml

+ 2
- 0
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
- 0
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
- 0
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

Loading…
Cancel
Save