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 "Noop controller pre and post config resources."
[apex-tripleo-heat-templates.git]
/
overcloud.j2.yaml
diff --git
a/overcloud.j2.yaml
b/overcloud.j2.yaml
index
ddf2701
..
2bfdf50
100644
(file)
--- a/
overcloud.j2.yaml
+++ b/
overcloud.j2.yaml
@@
-46,8
+46,8
@@
parameters:
CloudNameCtlplane:
default: overcloud.ctlplane.localdomain
description: >
CloudNameCtlplane:
default: overcloud.ctlplane.localdomain
description: >
- The DNS name of this cloud's
storage management
endpoint. E.g.
- 'ci-overcloud.
management
.tripleo.org'.
+ The DNS name of this cloud's
provisioning network
endpoint. E.g.
+ 'ci-overcloud.
ctlplane
.tripleo.org'.
type: string
ControlFixedIPs:
default: []
type: string
ControlFixedIPs:
default: []
@@
-89,7
+89,7
@@
parameters:
description: Neutron ID or name for ctlplane network.
NeutronPublicInterface:
default: nic1
description: Neutron ID or name for ctlplane network.
NeutronPublicInterface:
default: nic1
- description: Wh
at interface to bridge onto br-ex for network nodes
.
+ description: Wh
ich interface to add to the NeutronPhysicalBridge
.
type: string
PublicVirtualFixedIPs:
default: []
type: string
PublicVirtualFixedIPs:
default: []