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 "Convert role templates to consume roles_data map"
[apex-tripleo-heat-templates.git]
/
environments
/
neutron-ml2-cisco-n1kv.yaml
diff --git
a/environments/neutron-ml2-cisco-n1kv.yaml
b/environments/neutron-ml2-cisco-n1kv.yaml
index
651e956
..
8d46e1c
100644
(file)
--- a/
environments/neutron-ml2-cisco-n1kv.yaml
+++ b/
environments/neutron-ml2-cisco-n1kv.yaml
@@
-5,7
+5,7
@@
resource_registry:
OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
parameter_defaults:
OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml
parameter_defaults:
- N1000vVSMIP: '192.
0.2
.50'
- N1000vMgmtGatewayIP: '192.
0.2
.1'
+ N1000vVSMIP: '192.
168.24
.50'
+ N1000vMgmtGatewayIP: '192.
168.24
.1'
N1000vVSMDomainID: '100'
N1000vVSMHostMgmtIntf: 'br-ex'
N1000vVSMDomainID: '100'
N1000vVSMHostMgmtIntf: 'br-ex'