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 "We don't need to set a default for the CephX keys and cluster FSID"
[apex-tripleo-heat-templates.git]
/
network
/
endpoints
/
endpoint_map.yaml
diff --git
a/network/endpoints/endpoint_map.yaml
b/network/endpoints/endpoint_map.yaml
index
43b9921
..
e1b8984
100644
(file)
--- a/
network/endpoints/endpoint_map.yaml
+++ b/
network/endpoints/endpoint_map.yaml
@@
-1688,7
+1688,7
@@
outputs:
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaAdmin, port]
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaAdmin, port]
- - /v2.1
/%(tenant_id)s
+ - /v2.1
uri_no_suffix:
list_join:
- ''
uri_no_suffix:
list_join:
- ''
@@
-1727,7
+1727,7
@@
outputs:
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaInternal, port]
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaInternal, port]
- - /v2.1
/%(tenant_id)s
+ - /v2.1
uri_no_suffix:
list_join:
- ''
uri_no_suffix:
list_join:
- ''
@@
-1766,7
+1766,7
@@
outputs:
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaPublic, port]
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaPublic, port]
- - /v2.1
/%(tenant_id)s
+ - /v2.1
uri_no_suffix:
list_join:
- ''
uri_no_suffix:
list_join:
- ''