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 "Containerize MySQL for HA"
[apex-tripleo-heat-templates.git]
/
network
/
ports
/
net_vip_map_external_v6.yaml
diff --git
a/network/ports/net_vip_map_external_v6.yaml
b/network/ports/net_vip_map_external_v6.yaml
index
f6d67fe
..
aa40cf1
100644
(file)
--- a/
network/ports/net_vip_map_external_v6.yaml
+++ b/
network/ports/net_vip_map_external_v6.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2015-04-30
+heat_template_version:
pike
parameters:
# Set these via parameter defaults to configure external VIPs
parameters:
# Set these via parameter defaults to configure external VIPs
@@
-45,12
+45,6
@@
parameters:
StorageMgmtIpUri:
default: ''
type: string
StorageMgmtIpUri:
default: ''
type: string
- TenantIp:
- default: ''
- type: string
- TenantIpUri:
- default: ''
- type: string
outputs:
net_ip_map:
outputs:
net_ip_map:
@@
-63,31
+57,26
@@
outputs:
internal_api: {get_param: InternalApiNetworkVip}
storage: {get_param: StorageNetworkVip}
storage_mgmt: {get_param: StorageMgmtNetworkVip}
internal_api: {get_param: InternalApiNetworkVip}
storage: {get_param: StorageNetworkVip}
storage_mgmt: {get_param: StorageMgmtNetworkVip}
- net_ip_uri_map:
- description: >
- A Hash containing a mapping of netowrk names to assigned IPs for a
- specific machine with brackets around IPv6 addresses for use in URLs.
- value:
- ctlplane: {get_param: ControlPlaneIP}
- external:
+ ctlplane_uri: {get_param: ControlPlaneIP}
+ external_uri:
list_join:
- ''
- - '['
- {get_param: ExternalNetworkVip}
- ']'
list_join:
- ''
- - '['
- {get_param: ExternalNetworkVip}
- ']'
- internal_api:
+ internal_api
_uri
:
list_join:
- ''
- - '['
- {get_param: InternalApiNetworkVip}
- ']'
list_join:
- ''
- - '['
- {get_param: InternalApiNetworkVip}
- ']'
- storage:
+ storage
_uri
:
list_join:
- ''
- - '['
- {get_param: StorageNetworkVip}
- ']'
list_join:
- ''
- - '['
- {get_param: StorageNetworkVip}
- ']'
- storage_mgmt:
+ storage_mgmt
_uri
:
list_join:
- ''
- - '['
list_join:
- ''
- - '['