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

diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index 4ba8d9cb..601554a1 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -1,10 +1,15 @@
 # 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'
   NeutronNuageNetPartitionName: 'default_name'
   NeutronNuageVSDIp: '0.0.0.0:0'
   NeutronNuageVSDUsername: 'username'
@@ -12,3 +17,10 @@ parameter_defaults:
   NeutronNuageVSDOrganization: 'organization'
   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/'