Merge "add heat-api-cfn to endpoint map"

This commit is contained in:
Jenkins 2016-05-19 08:58:44 +00:00 committed by Gerrit Code Review
commit 27625182b2
3 changed files with 138 additions and 0 deletions

View File

@ -24,6 +24,9 @@ parameter_defaults:
HeatAdmin: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
HeatInternal: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
HeatPublic: {protocol: 'https', port: '13004', host: 'CLOUDNAME'}
HeatCfnAdmin: {protocol: 'http', port: '8000', host: 'IP_ADDRESS'}
HeatCfnInternal: {protocol: 'http', port: '8000', host: 'IP_ADDRESS'}
HeatCfnPublic: {protocol: 'https', port: '13005', host: 'CLOUDNAME'}
HorizonPublic: {protocol: 'https', port: '443', host: 'CLOUDNAME'}
KeystoneAdmin: {protocol: 'http', port: '35357', host: 'IP_ADDRESS'}
KeystoneInternal: {protocol: 'http', port: '5000', host: 'IP_ADDRESS'}

View File

@ -79,6 +79,21 @@ Heat:
'': /v1/%(tenant_id)s
port: 8004
HeatCfn:
Internal:
vip_param: HeatApi
uri_suffixes:
'': /v1
Public:
vip_param: Public
uri_suffixes:
'': /v1
Admin:
vip_param: HeatApi
uri_suffixes:
'': /v1
port: 8000
Horizon:
Public:
vip_param: Public

View File

@ -45,6 +45,9 @@ parameters:
HeatAdmin: {protocol: http, port: '8004', host: IP_ADDRESS}
HeatInternal: {protocol: http, port: '8004', host: IP_ADDRESS}
HeatPublic: {protocol: http, port: '8004', host: IP_ADDRESS}
HeatCfnAdmin: {protocol: http, port: '8000', host: IP_ADDRESS}
HeatCfnInternal: {protocol: http, port: '8000', host: IP_ADDRESS}
HeatCfnPublic: {protocol: http, port: '8000', host: IP_ADDRESS}
HorizonPublic: {protocol: http, port: '80', host: IP_ADDRESS}
KeystoneAdmin: {protocol: http, port: '35357', host: IP_ADDRESS}
KeystoneInternal: {protocol: http, port: '5000', host: IP_ADDRESS}
@ -916,6 +919,123 @@ outputs:
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, HeatPublic, port]
HeatCfnAdmin:
host:
str_replace:
template:
get_param: [EndpointMap, HeatCfnAdmin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: HeatApiVirtualIP}
port:
get_param: [EndpointMap, HeatCfnAdmin, port]
protocol:
get_param: [EndpointMap, HeatCfnAdmin, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, HeatCfnAdmin, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, HeatCfnAdmin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: HeatApiVirtualIP}
- ':'
- get_param: [EndpointMap, HeatCfnAdmin, port]
- /v1
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, HeatCfnAdmin, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, HeatCfnAdmin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: HeatApiVirtualIP}
- ':'
- get_param: [EndpointMap, HeatCfnAdmin, port]
HeatCfnInternal:
host:
str_replace:
template:
get_param: [EndpointMap, HeatCfnInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: HeatApiVirtualIP}
port:
get_param: [EndpointMap, HeatCfnInternal, port]
protocol:
get_param: [EndpointMap, HeatCfnInternal, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, HeatCfnInternal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, HeatCfnInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: HeatApiVirtualIP}
- ':'
- get_param: [EndpointMap, HeatCfnInternal, port]
- /v1
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, HeatCfnInternal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, HeatCfnInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: HeatApiVirtualIP}
- ':'
- get_param: [EndpointMap, HeatCfnInternal, port]
HeatCfnPublic:
host:
str_replace:
template:
get_param: [EndpointMap, HeatCfnPublic, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
port:
get_param: [EndpointMap, HeatCfnPublic, port]
protocol:
get_param: [EndpointMap, HeatCfnPublic, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, HeatCfnPublic, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, HeatCfnPublic, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, HeatCfnPublic, port]
- /v1
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, HeatCfnPublic, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, HeatCfnPublic, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, HeatCfnPublic, port]
HorizonPublic:
host:
str_replace: