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 "Disable openstack-cinder-volume in step1 and reenable it in step2"
[apex-tripleo-heat-templates.git]
/
network
/
ports
/
from_service_v6.yaml
diff --git
a/network/ports/from_service_v6.yaml
b/network/ports/from_service_v6.yaml
index
2dd0a0e
..
80060b5
100644
(file)
--- a/
network/ports/from_service_v6.yaml
+++ b/
network/ports/from_service_v6.yaml
@@
-24,6
+24,12
@@
parameters:
description: The name of the undercloud Neutron control plane
default: ctlplane
type: string
description: The name of the undercloud Neutron control plane
default: ctlplane
type: string
+ FixedIPs: # Here for compatibility with ctlplane_vip.yaml
+ description: >
+ Control the IP allocation for the VIP port. E.g.
+ [{'ip_address':'1.2.3.4'}]
+ default: []
+ type: json
ServiceVips:
default: {}
type: json
ServiceVips:
default: {}
type: json