From cfe872ed4f889b6e891c7250cd394c25efb8ef27 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. Change-Id: I575c0d438a65ce24ee6cb75fec1b95a418e875b1 --- environments/neutron-ml2-ovn-dvr-ha.yaml | 2 ++ environments/neutron-ml2-ovn-dvr.yaml | 2 ++ environments/services-baremetal/neutron-ovn-dvr-ha.yaml | 2 ++ environments/services-baremetal/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 7568d56f47..b550f0615d 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 93f3116ed2..bac9a3b637 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-baremetal/neutron-ovn-dvr-ha.yaml b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml index 6b3c824286..414d75ae89 100644 --- a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml +++ b/environments/services-baremetal/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-baremetal/neutron-ovn-dvr.yaml b/environments/services-baremetal/neutron-ovn-dvr.yaml index 6dd1cd293c..a20b9d4b6b 100644 --- a/environments/services-baremetal/neutron-ovn-dvr.yaml +++ b/environments/services-baremetal/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 diff --git a/environments/services/neutron-ovn-dvr-ha.yaml b/environments/services/neutron-ovn-dvr-ha.yaml index 5c850216ab..4f01781377 100644 --- a/environments/services/neutron-ovn-dvr-ha.yaml +++ b/environments/services/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/neutron-ovn-dvr.yaml b/environments/services/neutron-ovn-dvr.yaml index eacbaac2b8..2c4d9edfe6 100644 --- a/environments/services/neutron-ovn-dvr.yaml +++ b/environments/services/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