Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Rework gnocchi-upgrade to run in a separate upgrade step"
[apex-tripleo-heat-templates.git]
/
environments
/
neutron-ml2-cisco-nexus-ucsm.yaml
diff --git
a/environments/neutron-ml2-cisco-nexus-ucsm.yaml
b/environments/neutron-ml2-cisco-nexus-ucsm.yaml
index
5a1a32a
..
ad11175
100644
(file)
--- a/
environments/neutron-ml2-cisco-nexus-ucsm.yaml
+++ b/
environments/neutron-ml2-cisco-nexus-ucsm.yaml
@@
-19,7
+19,7
@@
parameter_defaults:
NetworkNexusSwitchReplayCount: 3
NetworkNexusProviderVlanAutoCreate: 'true'
NetworkNexusProviderVlanAutoTrunk: 'true'
NetworkNexusSwitchReplayCount: 3
NetworkNexusProviderVlanAutoCreate: 'true'
NetworkNexusProviderVlanAutoTrunk: 'true'
- NetworkNexusVxlanGlobalConfig: '
tru
e'
+ NetworkNexusVxlanGlobalConfig: '
fals
e'
NetworkNexusHostKeyChecks: 'false'
NetworkNexusVxlanVniRanges: '0:0'
NetworkNexusVxlanMcastRanges: '0.0.0.0:0.0.0.0'
NetworkNexusHostKeyChecks: 'false'
NetworkNexusVxlanVniRanges: '0:0'
NetworkNexusVxlanMcastRanges: '0.0.0.0:0.0.0.0'