Merge "Remove Combination alarms support"

[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 9d739f0..7489924 100644 (file)
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -7,7 +7,7 @@ resource_registry:
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   # Override the NeutronCorePlugin to use Nuage
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginNuage
-  OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-nuage.yaml
 
 parameter_defaults:
   NeutronNuageOSControllerIp: '0.0.0.0'
@@ -19,7 +19,7 @@ parameter_defaults:
   NeutronNuageBaseURIVersion: 'default_uri_version'
   NeutronNuageCMSId: ''
   UseForwardedFor: true
-  NeutronCorePlugin: 'neutron.plugins.nuage.plugin.NuagePlugin'
+  NeutronCorePlugin: 'nuage_neutron.plugins.nuage.plugin.NuagePlugin'
   NeutronEnableDHCPAgent: false
   NeutronServicePlugins: []
   NovaOVSBridge: 'alubr0'