From 2dcd4af21e893990338524c6f934f4ae712acc95 Mon Sep 17 00:00:00 2001 From: Andrew Austin Date: Thu, 21 Jun 2018 15:19:17 +0000 Subject: [PATCH] Prevent Neutron L3 and Metadata agents from running when using OVN DVR. When using the DVR OVN environments, Neutron metadata and L3 agents could be left running on the overcloud compute nodes. This patch explicitly nullifies the DVR versions of those Heat resources to ensure they are disabled. Closes-Bug: #1779701 Change-Id: I575c0d438a65ce24ee6cb75fec1b95a418e875b1 (cherry picked from commit cfe872ed4f889b6e891c7250cd394c25efb8ef27) --- environments/neutron-ml2-ovn-dvr-ha.yaml | 2 ++ environments/neutron-ml2-ovn-dvr.yaml | 2 ++ environments/services-docker/neutron-ovn-dvr-ha.yaml | 2 ++ environments/services-docker/neutron-ovn-dvr.yaml | 2 ++ environments/services/neutron-ovn-dvr-ha.yaml | 2 ++ environments/services/neutron-ovn-dvr.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/environments/neutron-ml2-ovn-dvr-ha.yaml b/environments/neutron-ml2-ovn-dvr-ha.yaml index c21ba3c89f..30c611ce1d 100644 --- a/environments/neutron-ml2-ovn-dvr-ha.yaml +++ b/environments/neutron-ml2-ovn-dvr-ha.yaml @@ -8,7 +8,9 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None diff --git a/environments/neutron-ml2-ovn-dvr.yaml b/environments/neutron-ml2-ovn-dvr.yaml index 076d66d770..0a99a845f5 100644 --- a/environments/neutron-ml2-ovn-dvr.yaml +++ b/environments/neutron-ml2-ovn-dvr.yaml @@ -9,7 +9,9 @@ resource_registry: OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None parameter_defaults: diff --git a/environments/services-docker/neutron-ovn-dvr-ha.yaml b/environments/services-docker/neutron-ovn-dvr-ha.yaml index b485515521..b75cc83f95 100644 --- a/environments/services-docker/neutron-ovn-dvr-ha.yaml +++ b/environments/services-docker/neutron-ovn-dvr-ha.yaml @@ -8,7 +8,9 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None diff --git a/environments/services-docker/neutron-ovn-dvr.yaml b/environments/services-docker/neutron-ovn-dvr.yaml index ab69a296c5..33b3c4ae7f 100644 --- a/environments/services-docker/neutron-ovn-dvr.yaml +++ b/environments/services-docker/neutron-ovn-dvr.yaml @@ -8,7 +8,9 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None diff --git a/environments/services/neutron-ovn-dvr-ha.yaml b/environments/services/neutron-ovn-dvr-ha.yaml index 5feeb68c36..1013eec869 100644 --- a/environments/services/neutron-ovn-dvr-ha.yaml +++ b/environments/services/neutron-ovn-dvr-ha.yaml @@ -7,7 +7,9 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None diff --git a/environments/services/neutron-ovn-dvr.yaml b/environments/services/neutron-ovn-dvr.yaml index 39bb03258d..6c244f45ba 100644 --- a/environments/services/neutron-ovn-dvr.yaml +++ b/environments/services/neutron-ovn-dvr.yaml @@ -7,7 +7,9 @@ resource_registry: OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None + OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None