X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-plumgrid.yaml;h=23c088b29e313eafec95dbd220758ba6b8d47fd4;hb=94bf2d5a0cfa2eacf93f5c7c9604f12064e6afd5;hp=5a244e5b27bf4100cbf1f28497b01e966f7d1103;hpb=0d3dacec4b63fb168f4f039501dc6e7b9622315b;p=apex-tripleo-heat-templates.git

diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml
index 5a244e5b..23c088b2 100755
--- a/environments/neutron-plumgrid.yaml
+++ b/environments/neutron-plumgrid.yaml
@@ -2,6 +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, 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
@@ -21,9 +26,3 @@ parameter_defaults:
   #Optional Parameters
   #PLUMgridNeutronPluginVersion: present
   #PLUMgridPlumlibVersion: present
-
-  # PLUMgrid doesn't require dhcp, l3, ovs and metadata agents
-  OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
-  NeutronEnableL3Agent: false
-  NeutronEnableMetadataAgent: false
-  NeutronEnableOVSAgent: false