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 "Introduce role-specific NodeUserData, use for docker"
[apex-tripleo-heat-templates.git]
/
network
/
ports
/
net_vip_map_external.yaml
diff --git
a/network/ports/net_vip_map_external.yaml
b/network/ports/net_vip_map_external.yaml
index
36426b3
..
71e6e81
100644
(file)
--- a/
network/ports/net_vip_map_external.yaml
+++ b/
network/ports/net_vip_map_external.yaml
@@
-2,7
+2,7
@@
heat_template_version: 2015-04-30
parameters:
# Set these via parameter defaults to configure external VIPs
parameters:
# Set these via parameter defaults to configure external VIPs
- Control
NetworkVip
:
+ Control
PlaneIP
:
default: ''
type: string
ExternalNetworkVip:
default: ''
type: string
ExternalNetworkVip:
@@
-24,16
+24,25
@@
parameters:
ExternalIp:
default: ''
type: string
ExternalIp:
default: ''
type: string
+ ExternalIpUri:
+ default: ''
+ type: string
InternalApiIp:
default: ''
type: string
InternalApiIp:
default: ''
type: string
+ InternalApiIpUri:
+ default: ''
+ type: string
StorageIp:
default: ''
type: string
StorageIp:
default: ''
type: string
+ StorageIpUri:
+ default: ''
+ type: string
StorageMgmtIp:
default: ''
type: string
StorageMgmtIp:
default: ''
type: string
-
TenantIp
:
+
StorageMgmtIpUri
:
default: ''
type: string
default: ''
type: string
@@
-43,8
+52,13
@@
outputs:
A Hash containing a mapping of network names to assigned IPs
for a specific machine.
value:
A Hash containing a mapping of network names to assigned IPs
for a specific machine.
value:
- ctlplane: {get_param: Control
NetworkVip
}
+ ctlplane: {get_param: Control
PlaneIP
}
external: {get_param: ExternalNetworkVip}
internal_api: {get_param: InternalApiNetworkVip}
storage: {get_param: StorageNetworkVip}
storage_mgmt: {get_param: StorageMgmtNetworkVip}
external: {get_param: ExternalNetworkVip}
internal_api: {get_param: InternalApiNetworkVip}
storage: {get_param: StorageNetworkVip}
storage_mgmt: {get_param: StorageMgmtNetworkVip}
+ ctlplane_uri: {get_param: ControlPlaneIP}
+ external_uri: {get_param: ExternalNetworkVip}
+ internal_api_uri: {get_param: InternalApiNetworkVip}
+ storage_uri: {get_param: StorageNetworkVip}
+ storage_mgmt_uri: {get_param: StorageMgmtNetworkVip}