X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-nuage-config.yaml;h=e157ae35ae9e76cc4c9a48eac707987658206aba;hb=d73f663f66108eb61575d9f15678b7c6649a13ee;hp=4ba8d9cbb559cfe4e6f57f5e6f7fcca0d3308ce9;hpb=3bf96c7462b0c3cd6a8d6bc8d134c9d698f6dd6e;p=apex-tripleo-heat-templates.git

diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index 4ba8d9cb..e157ae35 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'
@@ -12,3 +18,10 @@ parameter_defaults:
   NeutronNuageVSDOrganization: 'organization'
   NeutronNuageBaseURIVersion: 'default_uri_version'
   NeutronNuageCMSId: ''
+  UseForwardedFor: true
+  NeutronCorePlugin: 'neutron.plugins.nuage.plugin.NuagePlugin'
+  NeutronEnableDHCPAgent: false
+  NeutronServicePlugins: []
+  NovaOVSBridge: 'alubr0'
+  controllerExtraConfig:
+    neutron::api_extensions_path: '/usr/lib/python2.7/site-packages/neutron/plugins/nuage/'