diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-10 14:47:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-10 14:47:19 +0000 |
| commit | d7fd9b075fad85efe4ab7809d4e1e66b3ae6c196 (patch) | |
| tree | 45f8ca781df16a4e68489bd9aefb337d000adbc5 /environments/neutron-plumgrid.yaml | |
| parent | a671a30b5196aa5953576928be526d70aed265fe (diff) | |
| parent | 89fbd07afef275e0f818d3575fd0be4a1d4248cf (diff) | |
Merge "composable neutron ml2 and ovs agent"
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 |