diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-24 19:24:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-24 19:24:54 +0000 |
| commit | e8b7c965fa1fadaad71c8281c046f4864e711dba (patch) | |
| tree | 8545ade94b7795bee9903451ff2906ad6cb03ccc /environments | |
| parent | a864074f28a9ff802989f1d18387e927c265e2d6 (diff) | |
| parent | 9e3bf28cf0a95c5c98658d196ffa6093b39e9655 (diff) | |
Merge "Disable Neutron agents with OVN."
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-ml2-ovn.yaml | 3 |
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 |