X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-ml2-cisco-nexus-ucsm.yaml;h=2c87470b4d08166797f43be2034a64d627767bd1;hb=d7d3c1598849b205f3e4e31f4ce69aa6c7e26f27;hp=5a1a32a3a2272d0f1f2f305e97152ce138ef223b;hpb=415d57b79b28b2c260d263e70be81b987ced7933;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..2c87470b 100644
--- a/environments/neutron-ml2-cisco-nexus-ucsm.yaml
+++ b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
@@ -2,6 +2,7 @@
 # a Cisco Neutron plugin.
 resource_registry:
   OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
+  OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
 
 parameter_defaults:
   NetworkUCSMIp: '127.0.0.1'
@@ -19,7 +20,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'