X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-ml2-cisco-nexus-ucsm.yaml;h=f5a0a3992f1710afc7a6c814a5241ae87496b10a;hb=2f5f8fcb2bbd2b9299ac0097a210ba4939d30dc4;hp=5a1a32a3a2272d0f1f2f305e97152ce138ef223b;hpb=611ba701609778986c3265b05d5c02afc55c711b;p=apex-tripleo-heat-templates.git

diff --git a/environments/neutron-ml2-cisco-nexus-ucsm.yaml b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
index 5a1a32a3..f5a0a399 100644
--- a/environments/neutron-ml2-cisco-nexus-ucsm.yaml
+++ b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
@@ -2,6 +2,8 @@
 # a Cisco Neutron plugin.
 resource_registry:
   OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
+  OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
 
 parameter_defaults:
   NetworkUCSMIp: '127.0.0.1'
@@ -19,7 +21,7 @@ parameter_defaults:
   NetworkNexusSwitchReplayCount: 3
   NetworkNexusProviderVlanAutoCreate: 'true'
   NetworkNexusProviderVlanAutoTrunk: 'true'
-  NetworkNexusVxlanGlobalConfig: 'true'
+  NetworkNexusVxlanGlobalConfig: 'false'
   NetworkNexusHostKeyChecks: 'false'
   NetworkNexusVxlanVniRanges: '0:0'
   NetworkNexusVxlanMcastRanges: '0.0.0.0:0.0.0.0'