Switch Cinder Api/Scheduler/Volume to composable roles

[apex-tripleo-heat-templates.git] / environments / neutron-plumgrid.yaml

diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml
index 5a244e5..19f51cf 100755 (executable)
--- a/environments/neutron-plumgrid.yaml
+++ b/environments/neutron-plumgrid.yaml
@@ -2,6 +2,10 @@
 # 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
+  OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
+  OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+  OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
 
 parameter_defaults:
   NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2
@@ -22,8 +26,5 @@ parameter_defaults:
   #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
+  # PLUMgrid doesn't require the ovs agent
   NeutronEnableOVSAgent: false