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 "Enable heat/puppet to manage the fernet keys and make it configurable"
[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
..
f5a0a39
100644
(file)
--- 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
# 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'
parameter_defaults:
NetworkUCSMIp: '127.0.0.1'
@@
-19,7
+21,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'