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
c291634
..
f5a0a39
100644
(file)
--- 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:
# 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'
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: ''
NetworkUCSMSupportedPciDevs: ''
NetworkNexusConfig: {}
NetworkNexusManagedPhysicalNetwork: ''
@@
-19,8
+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'
-