summaryrefslogtreecommitdiffstats
path: root/environments/neutron-midonet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-10 14:47:19 +0000
committerGerrit Code Review <review@openstack.org>2016-06-10 14:47:19 +0000
commitd7fd9b075fad85efe4ab7809d4e1e66b3ae6c196 (patch)
tree45f8ca781df16a4e68489bd9aefb337d000adbc5 /environments/neutron-midonet.yaml
parenta671a30b5196aa5953576928be526d70aed265fe (diff)
parent89fbd07afef275e0f818d3575fd0be4a1d4248cf (diff)
Merge "composable neutron ml2 and ovs agent"
Diffstat (limited to 'environments/neutron-midonet.yaml')
-rw-r--r--environments/neutron-midonet.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/neutron-midonet.yaml b/environments/neutron-midonet.yaml
index 463c1874..7f50f15b 100644
--- a/environments/neutron-midonet.yaml
+++ b/environments/neutron-midonet.yaml
@@ -3,13 +3,13 @@ resource_registry:
OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
OS::TripleO::Controller::Net::SoftwareConfig: ../net-config-linux-bridge.yaml # We have to avoid any ovs bridge. MidoNet is incompatible with its datapath
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+ OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
parameter_defaults:
EnableZookeeperOnController: true
EnableCassandraOnController: true
NeutronCorePlugin: 'midonet.neutron.plugin_v1.MidonetPluginV2' # Overriding default core_plugin in Neutron. Don't touch it
NeutronEnableIsolatedMetadata: true # MidoNet 1.9 needs this one to work. Don't change it
- NeutronEnableOVSAgent: false
# Other available options for MidoNet Services
# TunnelZoneName: 'tunnelname'