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 "Move containers common volumes from yaql to list_concat"
[apex-tripleo-heat-templates.git]
/
overcloud.j2.yaml
diff --git
a/overcloud.j2.yaml
b/overcloud.j2.yaml
index
a2d501d
..
7cf6ad5
100644
(file)
--- a/
overcloud.j2.yaml
+++ b/
overcloud.j2.yaml
@@
-51,7
+51,9
@@
parameters:
type: string
ControlFixedIPs:
default: []
type: string
ControlFixedIPs:
default: []
- description: Should be used for arbitrary ips.
+ description: >
+ Control the IP allocation for the ControlVirtualIP port. E.g.
+ [{'ip_address':'1.2.3.4'}]
type: json
InternalApiVirtualFixedIPs:
default: []
type: json
InternalApiVirtualFixedIPs:
default: []
@@
-665,6
+667,7
@@
resources:
AllNodesDeploySteps:
type: OS::TripleO::PostDeploySteps
depends_on:
AllNodesDeploySteps:
type: OS::TripleO::PostDeploySteps
depends_on:
+ - AllNodesExtraConfig
{% for role in roles %}
- {{role.name}}AllNodesDeployment
{% endfor %}
{% for role in roles %}
- {{role.name}}AllNodesDeployment
{% endfor %}