X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-ml2-cisco-nexus-ucsm.yaml;h=f5a0a3992f1710afc7a6c814a5241ae87496b10a;hb=12aaefa939974fe9970cff4e3f933d8411a9fa91;hp=c291634cf51dc859244c29682b88c8eea0258377;hpb=13d59fd1b62f2a3649e140df22b632e1312a870f;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 c291634c..f5a0a399 100644
--- a/environments/neutron-ml2-cisco-nexus-ucsm.yaml
+++ b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
@@ -1,13 +1,15 @@
 # A Heat environment file which can be used to enable a
 # a Cisco Neutron plugin.
 resource_registry:
-  OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/network-cisco.yaml
+  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'
   NetworkUCSMUsername: 'admin'
   NetworkUCSMPassword: 'password'
-  NetworkUCSMHostList: 'host1:profile1, host2:profile2'
+  NetworkUCSMHostList: '12:34:56:78:9a:bc:profile1, 12:34:56:78:9a:de:profile2'
   NetworkUCSMSupportedPciDevs: ''
   NetworkNexusConfig: {}
   NetworkNexusManagedPhysicalNetwork: ''
@@ -19,8 +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'
-