X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-plumgrid.yaml;h=8794621137eaf8f3f38c0fb2df71ef68fd5fea2b;hb=775a1c1b25c824f66c449f049e48de239c27a266;hp=19f51cfc95deaf037357c05cfcb5b3d0cc7fab07;hpb=168bc2f6ff7310db6dc4cf957fdbb121419a3fcf;p=apex-tripleo-heat-templates.git

diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml
index 19f51cfc..87946211 100755
--- a/environments/neutron-plumgrid.yaml
+++ b/environments/neutron-plumgrid.yaml
@@ -1,11 +1,15 @@
 # A Heat environment file which can be used to enable PLUMgrid
 # 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
+  OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
+  # Override the Neutron core plugin to use PLUMgrid
+  OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginPlumgrid
+  OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-plumgrid.yaml
 
 parameter_defaults:
   NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2
@@ -25,6 +29,3 @@ parameter_defaults:
   #Optional Parameters
   #PLUMgridNeutronPluginVersion: present
   #PLUMgridPlumlibVersion: present
-
-  # PLUMgrid doesn't require the ovs agent
-  NeutronEnableOVSAgent: false