X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-plumgrid.yaml;h=23c088b29e313eafec95dbd220758ba6b8d47fd4;hb=94bf2d5a0cfa2eacf93f5c7c9604f12064e6afd5;hp=19f51cfc95deaf037357c05cfcb5b3d0cc7fab07;hpb=168bc2f6ff7310db6dc4cf957fdbb121419a3fcf;p=apex-tripleo-heat-templates.git 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