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-plumgrid.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-plumgrid.yaml')
| -rwxr-xr-x | environments/neutron-plumgrid.yaml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml index 19f51cfc..23c088b2 100755 --- a/environments/neutron-plumgrid.yaml +++ b/environments/neutron-plumgrid.yaml @@ -2,10 +2,11 @@ # extensions, configured via puppet resource_registry: OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-plumgrid.yaml - # PLUMgrid doesn't require dhcp, l3, and metadata agents + # PLUMgrid doesn't require dhcp, l3, metadata, and ovs agents OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None + OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None parameter_defaults: NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2 @@ -25,6 +26,3 @@ parameter_defaults: #Optional Parameters #PLUMgridNeutronPluginVersion: present #PLUMgridPlumlibVersion: present - - # PLUMgrid doesn't require the ovs agent - NeutronEnableOVSAgent: false |