Switch Cinder Api/Scheduler/Volume to composable roles

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

diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml
index 4704dbc..ceccd13 100644 (file)
--- a/environments/neutron-opencontrail.yaml
+++ b/environments/neutron-opencontrail.yaml
@@ -3,13 +3,13 @@
 resource_registry:
   OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-opencontrail.yaml
   OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml
+  OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
+  OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
+  OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
 
 parameter_defaults:
   NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2
   NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin
-  NeutronEnableDHCPAgent: false
-  NeutronEnableL3Agent: false
-  NeutronEnableMetadataAgent: false
   NeutronEnableOVSAgent: false
   NeutronEnableTunnelling: false