From 03c614653a06d4e57f9782bf12746dae791d8cde Mon Sep 17 00:00:00 2001 From: Brendan Date: Tue, 5 Nov 2019 06:50:59 +1000 Subject: [PATCH] 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 14228a33d5b0cdbc69bdf805786bb1046711627a) --- environments/external-loadbalancer-vip-v6-all.yaml | 2 ++ environments/external-loadbalancer-vip-v6.yaml | 2 ++ environments/external-loadbalancer-vip.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/environments/external-loadbalancer-vip-v6-all.yaml b/environments/external-loadbalancer-vip-v6-all.yaml index 057e53a23a..e88e17b9f9 100644 --- a/environments/external-loadbalancer-vip-v6-all.yaml +++ b/environments/external-loadbalancer-vip-v6-all.yaml @@ -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 diff --git a/environments/external-loadbalancer-vip-v6.yaml b/environments/external-loadbalancer-vip-v6.yaml index c8375fc784..298a0c055c 100644 --- a/environments/external-loadbalancer-vip-v6.yaml +++ b/environments/external-loadbalancer-vip-v6.yaml @@ -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 diff --git a/environments/external-loadbalancer-vip.yaml b/environments/external-loadbalancer-vip.yaml index 33f145d977..2f298daf22 100644 --- a/environments/external-loadbalancer-vip.yaml +++ b/environments/external-loadbalancer-vip.yaml @@ -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