aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Talerico <jtaleric@redhat.com>2016-10-18 12:01:27 -0400
committerBabu Shanmugam <bschanmu@redhat.com>2016-11-24 10:09:53 +0000
commit9e3bf28cf0a95c5c98658d196ffa6093b39e9655 (patch)
tree5592360d8345220fbd4907c5edc601c47205baf5
parent43b7712bd86764bf5d634d1ff0f2b5f05d55a413 (diff)
Disable Neutron agents with OVN.
OVN natively implements services that are provided by Neutron agents. This patch disables the Neutron DHCP agent as well as the OVS agent for compute nodes. Closes-bug: 1634580 Change-Id: I70631c2facbbf08257868e26e14af942ad7f2893
-rw-r--r--environments/neutron-ml2-ovn.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/environments/neutron-ml2-ovn.yaml b/environments/neutron-ml2-ovn.yaml
index 821ad0c2..bafb2a73 100644
--- a/environments/neutron-ml2-ovn.yaml
+++ b/environments/neutron-ml2-ovn.yaml
@@ -5,6 +5,9 @@ resource_registry:
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-ovn.yaml
+# Disabling Neutron services that overlap with OVN
+ OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
+ OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
parameter_defaults:
NeutronMechanismDrivers: ovn