diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-04-20 14:22:27 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-06-09 10:45:30 -0400 |
| commit | 89fbd07afef275e0f818d3575fd0be4a1d4248cf (patch) | |
| tree | d4b0b07a2a374c91a337d5dac74394d76ec88fb6 /environments/neutron-midonet.yaml | |
| parent | 08a201e23853455ffce6ff0d6c72163547ae7c06 (diff) | |
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
Diffstat (limited to 'environments/neutron-midonet.yaml')
| -rw-r--r-- | environments/neutron-midonet.yaml | 2 |
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' |