openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add NovaVNCProxy back into endpoint_map 

Due to an incorrect rebase, d0dcb9401c
dropped the changes made in dd7602ad82 to
add a vncproxy to the endpoint map. This change restores them.

Change-Id: Ifef7f955481405d5fe39ba48c8b1a79aa9c170f2
This commit is contained in:
Zane Bitter 2016-02-02 12:32:37 -05:00
parent f8633a42e2
commit 5c0b1e88bc
2 changed files with 126 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
network/endpoints/endpoint_data.yaml
View File

@ -151,6 +151,15 @@ NovaEC2:
'': /services/Admin
port: 8773
NovaVNCProxy:
Internal:
vip_param: NovaApi
Public:
vip_param: Public
Admin:
vip_param: NovaApi
port: 6080
Swift:
Internal:
vip_param: SwiftProxy

117
network/endpoints/endpoint_map.yaml
View File

@ -52,6 +52,9 @@ parameters:
NovaEC2Admin: {protocol: http, port: '8773', host: IP_ADDRESS}
NovaEC2Internal: {protocol: http, port: '8773', host: IP_ADDRESS}
NovaEC2Public: {protocol: http, port: '8773', host: IP_ADDRESS}
NovaVNCProxyAdmin: {protocol: http, port: '6080', host: IP_ADDRESS}
NovaVNCProxyInternal: {protocol: http, port: '6080', host: IP_ADDRESS}
NovaVNCProxyPublic: {protocol: http, port: '6080', host: IP_ADDRESS}
SaharaAdmin: {protocol: http, port: '8386', host: IP_ADDRESS}
SaharaInternal: {protocol: http, port: '8386', host: IP_ADDRESS}
SaharaPublic: {protocol: http, port: '8386', host: IP_ADDRESS}
@ -1535,6 +1538,120 @@ outputs:
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaEC2Public, port]
NovaVNCProxyAdmin:
host:
str_replace:
template:
get_param: [EndpointMap, NovaVNCProxyAdmin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
port:
get_param: [EndpointMap, NovaVNCProxyAdmin, port]
protocol:
get_param: [EndpointMap, NovaVNCProxyAdmin, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, NovaVNCProxyAdmin, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaVNCProxyAdmin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaVNCProxyAdmin, port]
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, NovaVNCProxyAdmin, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaVNCProxyAdmin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaVNCProxyAdmin, port]
NovaVNCProxyInternal:
host:
str_replace:
template:
get_param: [EndpointMap, NovaVNCProxyInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
port:
get_param: [EndpointMap, NovaVNCProxyInternal, port]
protocol:
get_param: [EndpointMap, NovaVNCProxyInternal, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, NovaVNCProxyInternal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaVNCProxyInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaVNCProxyInternal, port]
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, NovaVNCProxyInternal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaVNCProxyInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaVNCProxyInternal, port]
NovaVNCProxyPublic:
host:
str_replace:
template:
get_param: [EndpointMap, NovaVNCProxyPublic, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
port:
get_param: [EndpointMap, NovaVNCProxyPublic, port]
protocol:
get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaVNCProxyPublic, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaVNCProxyPublic, port]
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, NovaVNCProxyPublic, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaVNCProxyPublic, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaVNCProxyPublic, port]
SaharaAdmin:
host:
str_replace: