Merge "Ceilometer composable roles for controller"

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

diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index bf5036b..28056b3 100644 (file)
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -1,10 +1,11 @@
 # A Heat environment file which can be used to enable a
 # a Neutron Nuage backend on the controller, configured via puppet
 resource_registry:
-  OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-nuage.yaml
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
+  # Override the NeutronCorePlugin to use Nuage
+  OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginNuage
 
 parameter_defaults:
   NeutronNuageOSControllerIp: '0.0.0.0'