X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-nuage-config.yaml;h=748992464a41a6f773c5953e65081aefcc72894f;hb=42405fae723a7e7d901ea222279efdf98d866657;hp=50ba8f5362227c3b0b66f27ee209615cd42a425e;hpb=ad18ee26299f6e45f47fb70d3c4805d8d11b3cc3;p=apex-tripleo-heat-templates.git

diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index 50ba8f53..74899246 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -1,7 +1,13 @@
 # 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
+  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: ../puppet/services/neutron-compute-plugin-nuage.yaml
 
 parameter_defaults:
   NeutronNuageOSControllerIp: '0.0.0.0'
@@ -13,3 +19,9 @@ parameter_defaults:
   NeutronNuageBaseURIVersion: 'default_uri_version'
   NeutronNuageCMSId: ''
   UseForwardedFor: true
+  NeutronCorePlugin: 'nuage_neutron.plugins.nuage.plugin.NuagePlugin'
+  NeutronEnableDHCPAgent: false
+  NeutronServicePlugins: []
+  NovaOVSBridge: 'alubr0'
+  controllerExtraConfig:
+    neutron::api_extensions_path: '/usr/lib/python2.7/site-packages/neutron/plugins/nuage/'