X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-nuage-config.yaml;h=601554a1791a6074d2144a894467c4d7405a2718;hb=05ec01df4325a50de5114ef28ae0cde3fd4b843a;hp=8eb25cc69f8de6b4dab5c58a134d947e18287fbb;hpb=59e2f29fd1a43bee6a6d59d655c6ba579597f67e;p=apex-tripleo-heat-templates.git

diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
index 8eb25cc6..601554a1 100644
--- a/environments/neutron-nuage-config.yaml
+++ b/environments/neutron-nuage-config.yaml
@@ -1,11 +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'
@@ -14,10 +18,8 @@ parameter_defaults:
   NeutronNuageBaseURIVersion: 'default_uri_version'
   NeutronNuageCMSId: ''
   UseForwardedFor: true
-  NeutronCorePlugin: 'neutron.plugins.nuage.plugin.NuagePlugin'
+  NeutronCorePlugin: 'nuage_neutron.plugins.nuage.plugin.NuagePlugin'
   NeutronEnableDHCPAgent: false
-  NeutronEnableMetadataAgent: false
-  NeutronEnableOVSAgent: false
   NeutronServicePlugins: []
   NovaOVSBridge: 'alubr0'
   controllerExtraConfig: