From 89fbd07afef275e0f818d3575fd0be4a1d4248cf Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 20 Apr 2016 14:22:27 -0400 Subject: composable neutron ml2 and ovs agent Adds new puppet and puppet pacemaker specific services for the Neutron ml2 configuration and the Ovs agent. Partially-implements: blueprint composable-services-within-roles Change-Id: I896e5dfe6fae49371c9fe7f47c4364eb6f621b07 --- environments/neutron-midonet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'environments/neutron-midonet.yaml') 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' -- cgit 1.2.3-korg